From 0cb2214dd218737f2c27e19b380ca19a9cad8a3e Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 16 Sep 2020 21:23:44 +0200
Subject: [PATCH 01/93] Basic structure for new admin app

---
 ccm-bundle-devel-wildfly/faces-config.NavData |  0
 ccm-bundle-devel-wildfly/pom.xml              |  2 +-
 .../src/main/webapp/WEB-INF/faces-config.xml  |  2 +-
 .../src/main/webapp/WEB-INF/web.xml           |  6 +-
 .../libreccm/ui/admin/AdminApplication.java   | 55 +++++++++++++
 .../org/libreccm/ui/admin/AdminConstants.java | 34 ++++++++
 .../java/org/libreccm/ui/admin/AdminPage.java | 72 +++++++++++++++++
 .../SystemInformationController.java          | 41 ++++++++++
 .../SystemInformationModel.java               | 79 +++++++++++++++++++
 .../SystemInformationPage.java                | 68 ++++++++++++++++
 .../libreccm/ui/admin/systeminformation.xhtml | 21 +++++
 .../org/libreccm/ui/AdminBundle.properties    |  2 +
 .../org/libreccm/ui/AdminBundle_de.properties |  2 +
 13 files changed, 381 insertions(+), 3 deletions(-)
 create mode 100644 ccm-bundle-devel-wildfly/faces-config.NavData
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/AdminConstants.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
 create mode 100644 ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
 create mode 100644 ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties

diff --git a/ccm-bundle-devel-wildfly/faces-config.NavData b/ccm-bundle-devel-wildfly/faces-config.NavData
new file mode 100644
index 000000000..e69de29bb
diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml
index fe0fefee9..e936bc880 100644
--- a/ccm-bundle-devel-wildfly/pom.xml
+++ b/ccm-bundle-devel-wildfly/pom.xml
@@ -213,7 +213,7 @@
                             <artifactId>ccm-core</artifactId>
                             <type>jar</type>
                             <includes>
-                                <include>views/</include>
+                                <include>WEB-INF/</include>
                             </includes>
                         </overlay>
                         <overlay>
diff --git a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml
index a1999da81..16605090f 100644
--- a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml
+++ b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/faces-config.xml
@@ -5,6 +5,6 @@
               xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
                                   http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
     <application>
-        <resource-handler>org.libreccm.ui.CcmFaceletsResourceHandler</resource-handler>
+        <resource-handler>org.libreccm.mvc.facelets.CcmViewResourceHandler</resource-handler>
     </application>
 </faces-config>
diff --git a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml
index 8ee4f3591..a42350b9f 100644
--- a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml
+++ b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml
@@ -15,6 +15,10 @@
         <param-name>ccm.distribution</param-name>
         <param-value>libreccm</param-value>
     </context-param>
+    <context-param>
+        <param-name>resteasy.resources</param-name>
+        <param-value>org.jboss.resteasy.plugins.stats.RegistryStatsResource</param-value>
+    </context-param>
 
     <!-- No JSESSIONID!!! -->
     <session-config>
@@ -66,7 +70,7 @@
         <param-value>true</param-value>
     </context-param>
     
-<!--    <servlet>
+    <!--    <servlet>
         <servlet-name>vaadin-servlet</servlet-name>
         <servlet-class>com.vaadin.cdi.server.VaadinCDIServlet</servlet-class>
     </servlet>
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
new file mode 100644
index 000000000..d9dcc457e
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin;
+
+
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@ApplicationPath("/@admin")
+public class AdminApplication extends Application {
+
+    @Inject
+    private Instance<AdminPage> adminPages;
+
+    @Override
+    public Set<Class<?>> getClasses() {
+        return adminPages
+            .stream()
+            .map(AdminPage::getControllerClasses)
+            .flatMap(controllers -> controllers.stream())
+            .collect(Collectors.toSet());
+
+//        final Set<Class<?>> classes = new HashSet<>();
+//        classes.add(SystemInformationController.class);
+////        classes.add(UsersApi.class);
+//        return classes;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminConstants.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminConstants.java
new file mode 100644
index 000000000..e8629ce98
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminConstants.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class AdminConstants {
+    
+    private AdminConstants() {
+        // Nothing
+    }
+    
+    public static final String ADMIN_BUNDLE = "org.libreccm.ui.AdminBundle";
+    
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
new file mode 100644
index 000000000..3aba8dbd8
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin;
+
+import java.util.Set;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public interface AdminPage {
+
+    /**
+     * Classes implementing the controllers of the page.
+     *
+     * @return A set of controllers to be added to the {@link AdminApplication}.
+     */
+    Set<Class<?>> getControllerClasses();
+
+    /**
+     * Gets the resourcebundle which provides the label of the admin page.
+     *
+     * @return The bundle to use for retrieving the label of the page.
+     */
+    String getLabelBundle();
+
+    /**
+     * Gets the key for retrieving the label of the page from the label bundle.
+     *
+     * @return The key of the label.
+     */
+    String getLabelKey();
+
+    /**
+     * Gets the resourcebundle which provides the description of the admin page.
+     *
+     * @return The bundle to use for retrieving the label of the page.
+     */
+    String getDescriptionBundle();
+
+    /**
+     * Gets the key for retrieving the description of the page from the
+     * description bundle.
+     *
+     * @return The key of the label.
+     */
+    String getDescriptionKey();
+
+    /**
+     * Gets the position of the page in the admin nav bar. 
+     * 
+     * @return The position of the page in the admin navigation.
+     */
+    int getPosition();
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
new file mode 100644
index 000000000..98fd2acd6
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.systeminformation;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/systeminformation")
+public class SystemInformationController {
+    
+    @GET
+    @Path("/")
+    public String getSystemInformation() {
+        return "org/libreccm/ui/admin/systeminformation.xhtml";
+    }
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java
new file mode 100644
index 000000000..4151afdcc
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.systeminformation;
+
+import com.arsdigita.util.SystemInformation;
+import com.arsdigita.util.UncheckedWrapperException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("SystemInformationModel")
+public class SystemInformationModel {
+
+    public Map<String, String> getCcmSystemInformation() {
+        final Properties properties = new Properties();
+        try {
+            final InputStream stream = getClass().getResourceAsStream(
+                "systeminformation.properties");
+            if (stream == null) {
+                properties.put("version", "");
+                properties.put("appname", "LibreCCM");
+                properties.put("apphomepage", "http://www.libreccm.org");
+            } else {
+                properties.load(stream);
+            }
+//            properties.load(getClass().getResourceAsStream(
+//                    "WEB-INF/systeminformation.properties"));
+        } catch (IOException ex) {
+            throw new UncheckedWrapperException(ex);
+        }
+
+        final Map<String, String> sysInfo = new HashMap<>();
+
+        for (String key : properties.stringPropertyNames()) {
+            sysInfo.put(key, properties.getProperty(key));
+        }
+
+        return sysInfo;
+    }
+
+    public Map<String, String> getJavaSystemProperties() {
+        final Properties systemProperties = System.getProperties();
+        final Map<String, String> result = new HashMap<>();
+        for (final Object key : systemProperties.keySet()) {
+            result.put(
+                (String) key, systemProperties.getProperty((String) key)
+            );
+        }
+        return result;
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
new file mode 100644
index 000000000..130bbab34
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.systeminformation;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.libreccm.ui.admin.AdminConstants;
+import org.libreccm.ui.admin.AdminPage;
+
+import javax.enterprise.context.ApplicationScoped;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@ApplicationScoped
+public class SystemInformationPage implements AdminPage {
+
+    @Override
+    public Set<Class<?>> getControllerClasses() {
+        final Set<Class<?>> classes = new HashSet<>();
+        classes.add(SystemInformationController.class);
+        return classes;
+    }
+
+    @Override
+    public String getLabelBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getLabelKey() {
+        return "systeminformation.label";
+    }
+
+    @Override
+    public String getDescriptionBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getDescriptionKey() {
+        return "systeminformation.description";
+    }
+
+    @Override
+    public int getPosition() {
+        return 80;
+    }
+
+}
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
new file mode 100644
index 000000000..b13f9f854
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:h="http://xmlns.jcp.org/jsf/html">
+    <h:head>
+        <title>System Information</title>
+    </h:head>
+    <h:body>
+        <h1>System Information</h1>
+        <h2>LibreCCM System Information</h2>
+        <dl>
+            <c:forEach items="#{SystemInformationModel.ccmSystemInformation}" 
+                       var="prop">
+            <div>
+            <dt>#{prop.key}</dt>
+            <dd>#{prop.value}</dd>
+            </div>
+            </c:forEach>
+        </dl>
+    </h:body>
+</html>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
new file mode 100644
index 000000000..c1be56855
--- /dev/null
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -0,0 +1,2 @@
+systeminformation.description=Provides several informations about LibreCCM and the environment
+systeminformation.label=System Information
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
new file mode 100644
index 000000000..e58de7251
--- /dev/null
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -0,0 +1,2 @@
+systeminformation.description=Zeigt Informationen \u00fcber LibreCCM und die Umgebung
+systeminformation.label=System Informationen

From dccf46ec7e50c6f30a9df17858740d1b0d0c5fae Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 17 Sep 2020 21:09:57 +0200
Subject: [PATCH 02/93] Bootstrap integration for ccm-admin

---
 ccm-core/package-lock.json                    | 6974 +++++++++++++++++
 ccm-core/package.json                         |   24 +
 ccm-core/pom.xml                              |  153 +-
 .../libreccm/ui/admin/systeminformation.xhtml |   11 +-
 .../src/main/scss/ccm-admin/ccm-admin.scss    |    1 +
 .../main/typescript/ccm-admin/ccm-admin.ts    |    1 +
 6 files changed, 7102 insertions(+), 62 deletions(-)
 create mode 100644 ccm-core/package-lock.json
 create mode 100644 ccm-core/package.json
 create mode 100644 ccm-core/src/main/scss/ccm-admin/ccm-admin.scss
 create mode 100644 ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts

diff --git a/ccm-core/package-lock.json b/ccm-core/package-lock.json
new file mode 100644
index 000000000..6106947ac
--- /dev/null
+++ b/ccm-core/package-lock.json
@@ -0,0 +1,6974 @@
+{
+    "name": "ccm-core",
+    "version": "7.0.0",
+    "lockfileVersion": 1,
+    "requires": true,
+    "dependencies": {
+        "@babel/code-frame": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+            "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+            "dev": true,
+            "requires": {
+                "@babel/highlight": "^7.10.4"
+            }
+        },
+        "@babel/compat-data": {
+            "version": "7.11.0",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
+            "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.12.0",
+                "invariant": "^2.2.4",
+                "semver": "^5.5.0"
+            }
+        },
+        "@babel/core": {
+            "version": "7.11.5",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.5.tgz",
+            "integrity": "sha512-fsEANVOcZHzrsV6dMVWqpSeXClq3lNbYrfFGme6DE25FQWe7pyeYpXyx9guqUnpy466JLzZ8z4uwSr2iv60V5Q==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.10.4",
+                "@babel/generator": "^7.11.5",
+                "@babel/helper-module-transforms": "^7.11.0",
+                "@babel/helpers": "^7.10.4",
+                "@babel/parser": "^7.11.5",
+                "@babel/template": "^7.10.4",
+                "@babel/traverse": "^7.11.5",
+                "@babel/types": "^7.11.5",
+                "convert-source-map": "^1.7.0",
+                "debug": "^4.1.0",
+                "gensync": "^1.0.0-beta.1",
+                "json5": "^2.1.2",
+                "lodash": "^4.17.19",
+                "resolve": "^1.3.2",
+                "semver": "^5.4.1",
+                "source-map": "^0.6.1"
+            },
+            "dependencies": {
+                "json5": {
+                    "version": "2.1.3",
+                    "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+                    "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+                    "dev": true,
+                    "requires": {
+                        "minimist": "^1.2.5"
+                    }
+                }
+            }
+        },
+        "@babel/generator": {
+            "version": "7.11.5",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.5.tgz",
+            "integrity": "sha512-9UqHWJ4IwRTy4l0o8gq2ef8ws8UPzvtMkVKjTLAiRmza9p9V6Z+OfuNd9fB1j5Q67F+dVJtPC2sZXI8NM9br4g==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.11.5",
+                "jsesc": "^2.5.1",
+                "source-map": "^0.6.1"
+            }
+        },
+        "@babel/helper-annotate-as-pure": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
+            "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-builder-binary-assignment-operator-visitor": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
+            "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-explode-assignable-expression": "^7.10.4",
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-builder-react-jsx": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz",
+            "integrity": "sha512-5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.10.4",
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-builder-react-jsx-experimental": {
+            "version": "7.11.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz",
+            "integrity": "sha512-Vc4aPJnRZKWfzeCBsqTBnzulVNjABVdahSPhtdMD3Vs80ykx4a87jTHtF/VR+alSrDmNvat7l13yrRHauGcHVw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.10.4",
+                "@babel/helper-module-imports": "^7.10.4",
+                "@babel/types": "^7.11.5"
+            }
+        },
+        "@babel/helper-compilation-targets": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
+            "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+            "dev": true,
+            "requires": {
+                "@babel/compat-data": "^7.10.4",
+                "browserslist": "^4.12.0",
+                "invariant": "^2.2.4",
+                "levenary": "^1.1.1",
+                "semver": "^5.5.0"
+            }
+        },
+        "@babel/helper-create-class-features-plugin": {
+            "version": "7.10.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz",
+            "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-function-name": "^7.10.4",
+                "@babel/helper-member-expression-to-functions": "^7.10.5",
+                "@babel/helper-optimise-call-expression": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/helper-replace-supers": "^7.10.4",
+                "@babel/helper-split-export-declaration": "^7.10.4"
+            }
+        },
+        "@babel/helper-create-regexp-features-plugin": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
+            "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.10.4",
+                "@babel/helper-regex": "^7.10.4",
+                "regexpu-core": "^4.7.0"
+            }
+        },
+        "@babel/helper-define-map": {
+            "version": "7.10.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
+            "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-function-name": "^7.10.4",
+                "@babel/types": "^7.10.5",
+                "lodash": "^4.17.19"
+            }
+        },
+        "@babel/helper-explode-assignable-expression": {
+            "version": "7.11.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
+            "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-function-name": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+            "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-get-function-arity": "^7.10.4",
+                "@babel/template": "^7.10.4",
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-get-function-arity": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+            "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-hoist-variables": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
+            "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-member-expression-to-functions": {
+            "version": "7.11.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+            "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.11.0"
+            }
+        },
+        "@babel/helper-module-imports": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+            "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-module-transforms": {
+            "version": "7.11.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+            "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-imports": "^7.10.4",
+                "@babel/helper-replace-supers": "^7.10.4",
+                "@babel/helper-simple-access": "^7.10.4",
+                "@babel/helper-split-export-declaration": "^7.11.0",
+                "@babel/template": "^7.10.4",
+                "@babel/types": "^7.11.0",
+                "lodash": "^4.17.19"
+            }
+        },
+        "@babel/helper-optimise-call-expression": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+            "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-plugin-utils": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
+            "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+            "dev": true
+        },
+        "@babel/helper-regex": {
+            "version": "7.10.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
+            "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
+            "dev": true,
+            "requires": {
+                "lodash": "^4.17.19"
+            }
+        },
+        "@babel/helper-remap-async-to-generator": {
+            "version": "7.11.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
+            "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.10.4",
+                "@babel/helper-wrap-function": "^7.10.4",
+                "@babel/template": "^7.10.4",
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-replace-supers": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+            "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-member-expression-to-functions": "^7.10.4",
+                "@babel/helper-optimise-call-expression": "^7.10.4",
+                "@babel/traverse": "^7.10.4",
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-simple-access": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+            "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+            "dev": true,
+            "requires": {
+                "@babel/template": "^7.10.4",
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helper-skip-transparent-expression-wrappers": {
+            "version": "7.11.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
+            "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.11.0"
+            }
+        },
+        "@babel/helper-split-export-declaration": {
+            "version": "7.11.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+            "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.11.0"
+            }
+        },
+        "@babel/helper-validator-identifier": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+            "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+            "dev": true
+        },
+        "@babel/helper-wrap-function": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
+            "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-function-name": "^7.10.4",
+                "@babel/template": "^7.10.4",
+                "@babel/traverse": "^7.10.4",
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/helpers": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
+            "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+            "dev": true,
+            "requires": {
+                "@babel/template": "^7.10.4",
+                "@babel/traverse": "^7.10.4",
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/highlight": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+            "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-validator-identifier": "^7.10.4",
+                "chalk": "^2.0.0",
+                "js-tokens": "^4.0.0"
+            }
+        },
+        "@babel/parser": {
+            "version": "7.11.5",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+            "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+            "dev": true
+        },
+        "@babel/plugin-proposal-async-generator-functions": {
+            "version": "7.10.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
+            "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/helper-remap-async-to-generator": "^7.10.4",
+                "@babel/plugin-syntax-async-generators": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-class-properties": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz",
+            "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-class-features-plugin": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-proposal-dynamic-import": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
+            "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-export-namespace-from": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz",
+            "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+            }
+        },
+        "@babel/plugin-proposal-json-strings": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
+            "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/plugin-syntax-json-strings": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-logical-assignment-operators": {
+            "version": "7.11.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz",
+            "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+            }
+        },
+        "@babel/plugin-proposal-nullish-coalescing-operator": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
+            "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-numeric-separator": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
+            "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+            }
+        },
+        "@babel/plugin-proposal-object-rest-spread": {
+            "version": "7.11.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
+            "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+                "@babel/plugin-transform-parameters": "^7.10.4"
+            }
+        },
+        "@babel/plugin-proposal-optional-catch-binding": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
+            "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-optional-chaining": {
+            "version": "7.11.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
+            "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+            }
+        },
+        "@babel/plugin-proposal-private-methods": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz",
+            "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-class-features-plugin": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-proposal-unicode-property-regex": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
+            "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-syntax-async-generators": {
+            "version": "7.8.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+            "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-class-properties": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
+            "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-syntax-dynamic-import": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+            "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-export-namespace-from": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+            "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-syntax-flow": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz",
+            "integrity": "sha512-yxQsX1dJixF4qEEdzVbst3SZQ58Nrooz8NV9Z9GL4byTE25BvJgl5lf0RECUf0fh28rZBb/RYTWn/eeKwCMrZQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-syntax-json-strings": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+            "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-jsx": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz",
+            "integrity": "sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-syntax-logical-assignment-operators": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+            "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-syntax-nullish-coalescing-operator": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+            "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-numeric-separator": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+            "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-syntax-object-rest-spread": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+            "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-optional-catch-binding": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+            "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-optional-chaining": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+            "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-top-level-await": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
+            "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-arrow-functions": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
+            "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-async-to-generator": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
+            "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-imports": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/helper-remap-async-to-generator": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-block-scoped-functions": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
+            "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-block-scoping": {
+            "version": "7.11.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
+            "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-classes": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
+            "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.10.4",
+                "@babel/helper-define-map": "^7.10.4",
+                "@babel/helper-function-name": "^7.10.4",
+                "@babel/helper-optimise-call-expression": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/helper-replace-supers": "^7.10.4",
+                "@babel/helper-split-export-declaration": "^7.10.4",
+                "globals": "^11.1.0"
+            }
+        },
+        "@babel/plugin-transform-computed-properties": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
+            "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-destructuring": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
+            "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-dotall-regex": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
+            "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-duplicate-keys": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
+            "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-exponentiation-operator": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
+            "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-flow-strip-types": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.10.4.tgz",
+            "integrity": "sha512-XTadyuqNst88UWBTdLjM+wEY7BFnY2sYtPyAidfC7M/QaZnSuIZpMvLxqGT7phAcnGyWh/XQFLKcGf04CnvxSQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/plugin-syntax-flow": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-for-of": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
+            "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-function-name": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
+            "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-function-name": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-literals": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
+            "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-member-expression-literals": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
+            "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-modules-amd": {
+            "version": "7.10.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
+            "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.10.5",
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "babel-plugin-dynamic-import-node": "^2.3.3"
+            }
+        },
+        "@babel/plugin-transform-modules-commonjs": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
+            "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/helper-simple-access": "^7.10.4",
+                "babel-plugin-dynamic-import-node": "^2.3.3"
+            }
+        },
+        "@babel/plugin-transform-modules-systemjs": {
+            "version": "7.10.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
+            "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-hoist-variables": "^7.10.4",
+                "@babel/helper-module-transforms": "^7.10.5",
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "babel-plugin-dynamic-import-node": "^2.3.3"
+            }
+        },
+        "@babel/plugin-transform-modules-umd": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
+            "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-named-capturing-groups-regex": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
+            "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-new-target": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
+            "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-object-super": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
+            "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/helper-replace-supers": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-parameters": {
+            "version": "7.10.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
+            "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-get-function-arity": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-property-literals": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
+            "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-react-jsx": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz",
+            "integrity": "sha512-L+MfRhWjX0eI7Js093MM6MacKU4M6dnCRa/QPDwYMxjljzSCzzlzKzj9Pk4P3OtrPcxr2N3znR419nr3Xw+65A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-builder-react-jsx": "^7.10.4",
+                "@babel/helper-builder-react-jsx-experimental": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/plugin-syntax-jsx": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-regenerator": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
+            "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+            "dev": true,
+            "requires": {
+                "regenerator-transform": "^0.14.2"
+            }
+        },
+        "@babel/plugin-transform-reserved-words": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
+            "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-shorthand-properties": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
+            "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-spread": {
+            "version": "7.11.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
+            "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+            }
+        },
+        "@babel/plugin-transform-sticky-regex": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
+            "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/helper-regex": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-template-literals": {
+            "version": "7.10.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
+            "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-typeof-symbol": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
+            "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-unicode-escapes": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz",
+            "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-unicode-regex": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
+            "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/preset-env": {
+            "version": "7.11.5",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz",
+            "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==",
+            "dev": true,
+            "requires": {
+                "@babel/compat-data": "^7.11.0",
+                "@babel/helper-compilation-targets": "^7.10.4",
+                "@babel/helper-module-imports": "^7.10.4",
+                "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/plugin-proposal-async-generator-functions": "^7.10.4",
+                "@babel/plugin-proposal-class-properties": "^7.10.4",
+                "@babel/plugin-proposal-dynamic-import": "^7.10.4",
+                "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
+                "@babel/plugin-proposal-json-strings": "^7.10.4",
+                "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
+                "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
+                "@babel/plugin-proposal-numeric-separator": "^7.10.4",
+                "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
+                "@babel/plugin-proposal-optional-catch-binding": "^7.10.4",
+                "@babel/plugin-proposal-optional-chaining": "^7.11.0",
+                "@babel/plugin-proposal-private-methods": "^7.10.4",
+                "@babel/plugin-proposal-unicode-property-regex": "^7.10.4",
+                "@babel/plugin-syntax-async-generators": "^7.8.0",
+                "@babel/plugin-syntax-class-properties": "^7.10.4",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+                "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+                "@babel/plugin-syntax-json-strings": "^7.8.0",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.0",
+                "@babel/plugin-syntax-top-level-await": "^7.10.4",
+                "@babel/plugin-transform-arrow-functions": "^7.10.4",
+                "@babel/plugin-transform-async-to-generator": "^7.10.4",
+                "@babel/plugin-transform-block-scoped-functions": "^7.10.4",
+                "@babel/plugin-transform-block-scoping": "^7.10.4",
+                "@babel/plugin-transform-classes": "^7.10.4",
+                "@babel/plugin-transform-computed-properties": "^7.10.4",
+                "@babel/plugin-transform-destructuring": "^7.10.4",
+                "@babel/plugin-transform-dotall-regex": "^7.10.4",
+                "@babel/plugin-transform-duplicate-keys": "^7.10.4",
+                "@babel/plugin-transform-exponentiation-operator": "^7.10.4",
+                "@babel/plugin-transform-for-of": "^7.10.4",
+                "@babel/plugin-transform-function-name": "^7.10.4",
+                "@babel/plugin-transform-literals": "^7.10.4",
+                "@babel/plugin-transform-member-expression-literals": "^7.10.4",
+                "@babel/plugin-transform-modules-amd": "^7.10.4",
+                "@babel/plugin-transform-modules-commonjs": "^7.10.4",
+                "@babel/plugin-transform-modules-systemjs": "^7.10.4",
+                "@babel/plugin-transform-modules-umd": "^7.10.4",
+                "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4",
+                "@babel/plugin-transform-new-target": "^7.10.4",
+                "@babel/plugin-transform-object-super": "^7.10.4",
+                "@babel/plugin-transform-parameters": "^7.10.4",
+                "@babel/plugin-transform-property-literals": "^7.10.4",
+                "@babel/plugin-transform-regenerator": "^7.10.4",
+                "@babel/plugin-transform-reserved-words": "^7.10.4",
+                "@babel/plugin-transform-shorthand-properties": "^7.10.4",
+                "@babel/plugin-transform-spread": "^7.11.0",
+                "@babel/plugin-transform-sticky-regex": "^7.10.4",
+                "@babel/plugin-transform-template-literals": "^7.10.4",
+                "@babel/plugin-transform-typeof-symbol": "^7.10.4",
+                "@babel/plugin-transform-unicode-escapes": "^7.10.4",
+                "@babel/plugin-transform-unicode-regex": "^7.10.4",
+                "@babel/preset-modules": "^0.1.3",
+                "@babel/types": "^7.11.5",
+                "browserslist": "^4.12.0",
+                "core-js-compat": "^3.6.2",
+                "invariant": "^2.2.2",
+                "levenary": "^1.1.1",
+                "semver": "^5.5.0"
+            }
+        },
+        "@babel/preset-modules": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+            "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.0.0",
+                "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+                "@babel/plugin-transform-dotall-regex": "^7.4.4",
+                "@babel/types": "^7.4.4",
+                "esutils": "^2.0.2"
+            }
+        },
+        "@babel/runtime": {
+            "version": "7.11.2",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
+            "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
+            "dev": true,
+            "requires": {
+                "regenerator-runtime": "^0.13.4"
+            }
+        },
+        "@babel/template": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+            "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.10.4",
+                "@babel/parser": "^7.10.4",
+                "@babel/types": "^7.10.4"
+            }
+        },
+        "@babel/traverse": {
+            "version": "7.11.5",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+            "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.10.4",
+                "@babel/generator": "^7.11.5",
+                "@babel/helper-function-name": "^7.10.4",
+                "@babel/helper-split-export-declaration": "^7.11.0",
+                "@babel/parser": "^7.11.5",
+                "@babel/types": "^7.11.5",
+                "debug": "^4.1.0",
+                "globals": "^11.1.0",
+                "lodash": "^4.17.19"
+            }
+        },
+        "@babel/types": {
+            "version": "7.11.5",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+            "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-validator-identifier": "^7.10.4",
+                "lodash": "^4.17.19",
+                "to-fast-properties": "^2.0.0"
+            }
+        },
+        "@iarna/toml": {
+            "version": "2.2.5",
+            "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
+            "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==",
+            "dev": true
+        },
+        "@mrmlnc/readdir-enhanced": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+            "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+            "dev": true,
+            "requires": {
+                "call-me-maybe": "^1.0.1",
+                "glob-to-regexp": "^0.3.0"
+            }
+        },
+        "@nodelib/fs.stat": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+            "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+            "dev": true
+        },
+        "@parcel/fs": {
+            "version": "1.11.0",
+            "resolved": "https://registry.npmjs.org/@parcel/fs/-/fs-1.11.0.tgz",
+            "integrity": "sha512-86RyEqULbbVoeo8OLcv+LQ1Vq2PKBAvWTU9fCgALxuCTbbs5Ppcvll4Vr+Ko1AnmMzja/k++SzNAwJfeQXVlpA==",
+            "dev": true,
+            "requires": {
+                "@parcel/utils": "^1.11.0",
+                "mkdirp": "^0.5.1",
+                "rimraf": "^2.6.2"
+            }
+        },
+        "@parcel/logger": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@parcel/logger/-/logger-1.11.1.tgz",
+            "integrity": "sha512-9NF3M6UVeP2udOBDILuoEHd8VrF4vQqoWHEafymO1pfSoOMfxrSJZw1MfyAAIUN/IFp9qjcpDCUbDZB+ioVevA==",
+            "dev": true,
+            "requires": {
+                "@parcel/workers": "^1.11.0",
+                "chalk": "^2.1.0",
+                "grapheme-breaker": "^0.3.2",
+                "ora": "^2.1.0",
+                "strip-ansi": "^4.0.0"
+            }
+        },
+        "@parcel/utils": {
+            "version": "1.11.0",
+            "resolved": "https://registry.npmjs.org/@parcel/utils/-/utils-1.11.0.tgz",
+            "integrity": "sha512-cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ==",
+            "dev": true
+        },
+        "@parcel/watcher": {
+            "version": "1.12.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-1.12.1.tgz",
+            "integrity": "sha512-od+uCtCxC/KoNQAIE1vWx1YTyKYY+7CTrxBJPRh3cDWw/C0tCtlBMVlrbplscGoEpt6B27KhJDCv82PBxOERNA==",
+            "dev": true,
+            "requires": {
+                "@parcel/utils": "^1.11.0",
+                "chokidar": "^2.1.5"
+            }
+        },
+        "@parcel/workers": {
+            "version": "1.11.0",
+            "resolved": "https://registry.npmjs.org/@parcel/workers/-/workers-1.11.0.tgz",
+            "integrity": "sha512-USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ==",
+            "dev": true,
+            "requires": {
+                "@parcel/utils": "^1.11.0",
+                "physical-cpu-count": "^2.0.0"
+            }
+        },
+        "@types/q": {
+            "version": "1.5.4",
+            "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+            "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
+            "dev": true
+        },
+        "abab": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz",
+            "integrity": "sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==",
+            "dev": true
+        },
+        "acorn": {
+            "version": "7.4.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
+            "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
+            "dev": true
+        },
+        "acorn-globals": {
+            "version": "4.3.4",
+            "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
+            "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
+            "dev": true,
+            "requires": {
+                "acorn": "^6.0.1",
+                "acorn-walk": "^6.0.1"
+            },
+            "dependencies": {
+                "acorn": {
+                    "version": "6.4.1",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+                    "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+                    "dev": true
+                }
+            }
+        },
+        "acorn-walk": {
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
+            "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
+            "dev": true
+        },
+        "ajv": {
+            "version": "6.12.4",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+            "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
+            "dev": true,
+            "requires": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+            }
+        },
+        "alphanum-sort": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+            "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
+            "dev": true
+        },
+        "ansi-regex": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+            "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+            "dev": true
+        },
+        "ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
+            "requires": {
+                "color-convert": "^1.9.0"
+            }
+        },
+        "ansi-to-html": {
+            "version": "0.6.14",
+            "resolved": "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.14.tgz",
+            "integrity": "sha512-7ZslfB1+EnFSDO5Ju+ue5Y6It19DRnZXWv8jrGHgIlPna5Mh4jz7BV5jCbQneXNFurQcKoolaaAjHtgSBfOIuA==",
+            "dev": true,
+            "requires": {
+                "entities": "^1.1.2"
+            }
+        },
+        "anymatch": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+            "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+            "dev": true,
+            "requires": {
+                "micromatch": "^3.1.4",
+                "normalize-path": "^2.1.1"
+            },
+            "dependencies": {
+                "normalize-path": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+                    "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+                    "dev": true,
+                    "requires": {
+                        "remove-trailing-separator": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "argparse": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+            "dev": true,
+            "requires": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "arr-diff": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+            "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+            "dev": true
+        },
+        "arr-flatten": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+            "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+            "dev": true
+        },
+        "arr-union": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+            "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+            "dev": true
+        },
+        "array-equal": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+            "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
+            "dev": true
+        },
+        "array-unique": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+            "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+            "dev": true
+        },
+        "asn1": {
+            "version": "0.2.4",
+            "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+            "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+            "dev": true,
+            "requires": {
+                "safer-buffer": "~2.1.0"
+            }
+        },
+        "asn1.js": {
+            "version": "5.4.1",
+            "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+            "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.0.0",
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0",
+                "safer-buffer": "^2.1.0"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "assert": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+            "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+            "dev": true,
+            "requires": {
+                "object-assign": "^4.1.1",
+                "util": "0.10.3"
+            },
+            "dependencies": {
+                "inherits": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                    "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+                    "dev": true
+                },
+                "util": {
+                    "version": "0.10.3",
+                    "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+                    "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "2.0.1"
+                    }
+                }
+            }
+        },
+        "assert-plus": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+            "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+            "dev": true
+        },
+        "assign-symbols": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+            "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+            "dev": true
+        },
+        "async-each": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+            "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+            "dev": true
+        },
+        "async-limiter": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+            "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+            "dev": true
+        },
+        "asynckit": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+            "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+            "dev": true
+        },
+        "atob": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+            "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+            "dev": true
+        },
+        "aws-sign2": {
+            "version": "0.7.0",
+            "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+            "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+            "dev": true
+        },
+        "aws4": {
+            "version": "1.10.1",
+            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
+            "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==",
+            "dev": true
+        },
+        "babel-plugin-dynamic-import-node": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+            "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+            "dev": true,
+            "requires": {
+                "object.assign": "^4.1.0"
+            }
+        },
+        "babel-runtime": {
+            "version": "6.26.0",
+            "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+            "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+            "dev": true,
+            "requires": {
+                "core-js": "^2.4.0",
+                "regenerator-runtime": "^0.11.0"
+            },
+            "dependencies": {
+                "regenerator-runtime": {
+                    "version": "0.11.1",
+                    "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+                    "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+                    "dev": true
+                }
+            }
+        },
+        "babel-types": {
+            "version": "6.26.0",
+            "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+            "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+            "dev": true,
+            "requires": {
+                "babel-runtime": "^6.26.0",
+                "esutils": "^2.0.2",
+                "lodash": "^4.17.4",
+                "to-fast-properties": "^1.0.3"
+            },
+            "dependencies": {
+                "to-fast-properties": {
+                    "version": "1.0.3",
+                    "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+                    "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+                    "dev": true
+                }
+            }
+        },
+        "babylon-walk": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/babylon-walk/-/babylon-walk-1.0.2.tgz",
+            "integrity": "sha1-OxWl3btIKni0zpwByLoYFwLZ1s4=",
+            "dev": true,
+            "requires": {
+                "babel-runtime": "^6.11.6",
+                "babel-types": "^6.15.0",
+                "lodash.clone": "^4.5.0"
+            }
+        },
+        "balanced-match": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+            "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+            "dev": true
+        },
+        "base": {
+            "version": "0.11.2",
+            "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+            "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+            "dev": true,
+            "requires": {
+                "cache-base": "^1.0.1",
+                "class-utils": "^0.3.5",
+                "component-emitter": "^1.2.1",
+                "define-property": "^1.0.0",
+                "isobject": "^3.0.1",
+                "mixin-deep": "^1.2.0",
+                "pascalcase": "^0.1.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^1.0.0"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "base64-js": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+            "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+            "dev": true
+        },
+        "bcrypt-pbkdf": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+            "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+            "dev": true,
+            "requires": {
+                "tweetnacl": "^0.14.3"
+            }
+        },
+        "binary-extensions": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+            "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+            "dev": true
+        },
+        "bindings": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+            "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+            "dev": true,
+            "requires": {
+                "file-uri-to-path": "1.0.0"
+            }
+        },
+        "bn.js": {
+            "version": "5.1.3",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+            "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
+            "dev": true
+        },
+        "boolbase": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+            "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+            "dev": true
+        },
+        "bootstrap": {
+            "version": "4.5.2",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.2.tgz",
+            "integrity": "sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A=="
+        },
+        "brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "braces": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+            "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+            "dev": true,
+            "requires": {
+                "arr-flatten": "^1.1.0",
+                "array-unique": "^0.3.2",
+                "extend-shallow": "^2.0.1",
+                "fill-range": "^4.0.0",
+                "isobject": "^3.0.1",
+                "repeat-element": "^1.1.2",
+                "snapdragon": "^0.8.1",
+                "snapdragon-node": "^2.0.1",
+                "split-string": "^3.0.2",
+                "to-regex": "^3.0.1"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "brfs": {
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz",
+            "integrity": "sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==",
+            "dev": true,
+            "requires": {
+                "quote-stream": "^1.0.1",
+                "resolve": "^1.1.5",
+                "static-module": "^2.2.0",
+                "through2": "^2.0.0"
+            }
+        },
+        "brorand": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+            "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+            "dev": true
+        },
+        "browser-process-hrtime": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+            "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+            "dev": true
+        },
+        "browserify-aes": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+            "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+            "dev": true,
+            "requires": {
+                "buffer-xor": "^1.0.3",
+                "cipher-base": "^1.0.0",
+                "create-hash": "^1.1.0",
+                "evp_bytestokey": "^1.0.3",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "browserify-cipher": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+            "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+            "dev": true,
+            "requires": {
+                "browserify-aes": "^1.0.4",
+                "browserify-des": "^1.0.0",
+                "evp_bytestokey": "^1.0.0"
+            }
+        },
+        "browserify-des": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+            "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+            "dev": true,
+            "requires": {
+                "cipher-base": "^1.0.1",
+                "des.js": "^1.0.0",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "browserify-rsa": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+            "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.1.0",
+                "randombytes": "^2.0.1"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "browserify-sign": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+            "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^5.1.1",
+                "browserify-rsa": "^4.0.1",
+                "create-hash": "^1.2.0",
+                "create-hmac": "^1.1.7",
+                "elliptic": "^6.5.3",
+                "inherits": "^2.0.4",
+                "parse-asn1": "^5.1.5",
+                "readable-stream": "^3.6.0",
+                "safe-buffer": "^5.2.0"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "3.6.0",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "^2.0.3",
+                        "string_decoder": "^1.1.1",
+                        "util-deprecate": "^1.0.1"
+                    }
+                },
+                "safe-buffer": {
+                    "version": "5.2.1",
+                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+                    "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+                    "dev": true
+                }
+            }
+        },
+        "browserify-zlib": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+            "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+            "dev": true,
+            "requires": {
+                "pako": "~1.0.5"
+            },
+            "dependencies": {
+                "pako": {
+                    "version": "1.0.11",
+                    "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+                    "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+                    "dev": true
+                }
+            }
+        },
+        "browserslist": {
+            "version": "4.14.0",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz",
+            "integrity": "sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==",
+            "dev": true,
+            "requires": {
+                "caniuse-lite": "^1.0.30001111",
+                "electron-to-chromium": "^1.3.523",
+                "escalade": "^3.0.2",
+                "node-releases": "^1.1.60"
+            }
+        },
+        "buffer": {
+            "version": "4.9.2",
+            "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+            "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+            "dev": true,
+            "requires": {
+                "base64-js": "^1.0.2",
+                "ieee754": "^1.1.4",
+                "isarray": "^1.0.0"
+            }
+        },
+        "buffer-equal": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
+            "integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=",
+            "dev": true
+        },
+        "buffer-from": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+            "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+            "dev": true
+        },
+        "buffer-xor": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+            "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+            "dev": true
+        },
+        "builtin-status-codes": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+            "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+            "dev": true
+        },
+        "cache-base": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+            "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+            "dev": true,
+            "requires": {
+                "collection-visit": "^1.0.0",
+                "component-emitter": "^1.2.1",
+                "get-value": "^2.0.6",
+                "has-value": "^1.0.0",
+                "isobject": "^3.0.1",
+                "set-value": "^2.0.0",
+                "to-object-path": "^0.3.0",
+                "union-value": "^1.0.0",
+                "unset-value": "^1.0.0"
+            }
+        },
+        "call-me-maybe": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+            "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+            "dev": true
+        },
+        "caller-callsite": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+            "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+            "dev": true,
+            "requires": {
+                "callsites": "^2.0.0"
+            }
+        },
+        "caller-path": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+            "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+            "dev": true,
+            "requires": {
+                "caller-callsite": "^2.0.0"
+            }
+        },
+        "callsites": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+            "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+            "dev": true
+        },
+        "caniuse-api": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+            "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.0.0",
+                "caniuse-lite": "^1.0.0",
+                "lodash.memoize": "^4.1.2",
+                "lodash.uniq": "^4.5.0"
+            }
+        },
+        "caniuse-lite": {
+            "version": "1.0.30001122",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001122.tgz",
+            "integrity": "sha512-pxjw28CThdrqfz06nJkpAc5SXM404TXB/h5f4UJX+rrXJKE/1bu/KAILc2AY+O6cQIFtRjV9qOR2vaEp9LDGUA==",
+            "dev": true
+        },
+        "caseless": {
+            "version": "0.12.0",
+            "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+            "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+            "dev": true
+        },
+        "chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "dev": true,
+            "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            }
+        },
+        "chokidar": {
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+            "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+            "dev": true,
+            "requires": {
+                "anymatch": "^2.0.0",
+                "async-each": "^1.0.1",
+                "braces": "^2.3.2",
+                "fsevents": "^1.2.7",
+                "glob-parent": "^3.1.0",
+                "inherits": "^2.0.3",
+                "is-binary-path": "^1.0.0",
+                "is-glob": "^4.0.0",
+                "normalize-path": "^3.0.0",
+                "path-is-absolute": "^1.0.0",
+                "readdirp": "^2.2.1",
+                "upath": "^1.1.1"
+            }
+        },
+        "cipher-base": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+            "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "class-utils": {
+            "version": "0.3.6",
+            "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+            "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+            "dev": true,
+            "requires": {
+                "arr-union": "^3.1.0",
+                "define-property": "^0.2.5",
+                "isobject": "^3.0.0",
+                "static-extend": "^0.1.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "cli-cursor": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+            "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+            "dev": true,
+            "requires": {
+                "restore-cursor": "^2.0.0"
+            }
+        },
+        "cli-spinners": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
+            "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
+            "dev": true
+        },
+        "clone": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+            "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+            "dev": true
+        },
+        "coa": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+            "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+            "dev": true,
+            "requires": {
+                "@types/q": "^1.5.1",
+                "chalk": "^2.4.1",
+                "q": "^1.1.2"
+            }
+        },
+        "collection-visit": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+            "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+            "dev": true,
+            "requires": {
+                "map-visit": "^1.0.0",
+                "object-visit": "^1.0.0"
+            }
+        },
+        "color": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+            "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+            "dev": true,
+            "requires": {
+                "color-convert": "^1.9.1",
+                "color-string": "^1.5.2"
+            }
+        },
+        "color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
+            "requires": {
+                "color-name": "1.1.3"
+            }
+        },
+        "color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+            "dev": true
+        },
+        "color-string": {
+            "version": "1.5.3",
+            "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+            "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+            "dev": true,
+            "requires": {
+                "color-name": "^1.0.0",
+                "simple-swizzle": "^0.2.2"
+            }
+        },
+        "combined-stream": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+            "dev": true,
+            "requires": {
+                "delayed-stream": "~1.0.0"
+            }
+        },
+        "command-exists": {
+            "version": "1.2.9",
+            "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+            "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
+            "dev": true
+        },
+        "commander": {
+            "version": "2.20.3",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "dev": true
+        },
+        "component-emitter": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+            "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+            "dev": true
+        },
+        "concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+            "dev": true
+        },
+        "concat-stream": {
+            "version": "1.6.2",
+            "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+            "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+            "dev": true,
+            "requires": {
+                "buffer-from": "^1.0.0",
+                "inherits": "^2.0.3",
+                "readable-stream": "^2.2.2",
+                "typedarray": "^0.0.6"
+            }
+        },
+        "console-browserify": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+            "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+            "dev": true
+        },
+        "constants-browserify": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+            "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+            "dev": true
+        },
+        "convert-source-map": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+            "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "~5.1.1"
+            }
+        },
+        "copy-descriptor": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+            "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+            "dev": true
+        },
+        "core-js": {
+            "version": "2.6.11",
+            "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+            "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
+            "dev": true
+        },
+        "core-js-compat": {
+            "version": "3.6.5",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
+            "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.8.5",
+                "semver": "7.0.0"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "7.0.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+                    "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+                    "dev": true
+                }
+            }
+        },
+        "core-util-is": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+            "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+            "dev": true
+        },
+        "cosmiconfig": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+            "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+            "dev": true,
+            "requires": {
+                "import-fresh": "^2.0.0",
+                "is-directory": "^0.3.1",
+                "js-yaml": "^3.13.1",
+                "parse-json": "^4.0.0"
+            }
+        },
+        "create-ecdh": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+            "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.1.0",
+                "elliptic": "^6.5.3"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "create-hash": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+            "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+            "dev": true,
+            "requires": {
+                "cipher-base": "^1.0.1",
+                "inherits": "^2.0.1",
+                "md5.js": "^1.3.4",
+                "ripemd160": "^2.0.1",
+                "sha.js": "^2.4.0"
+            }
+        },
+        "create-hmac": {
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+            "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+            "dev": true,
+            "requires": {
+                "cipher-base": "^1.0.3",
+                "create-hash": "^1.1.0",
+                "inherits": "^2.0.1",
+                "ripemd160": "^2.0.0",
+                "safe-buffer": "^5.0.1",
+                "sha.js": "^2.4.8"
+            }
+        },
+        "cross-spawn": {
+            "version": "6.0.5",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+            "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+            "dev": true,
+            "requires": {
+                "nice-try": "^1.0.4",
+                "path-key": "^2.0.1",
+                "semver": "^5.5.0",
+                "shebang-command": "^1.2.0",
+                "which": "^1.2.9"
+            }
+        },
+        "crypto-browserify": {
+            "version": "3.12.0",
+            "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+            "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+            "dev": true,
+            "requires": {
+                "browserify-cipher": "^1.0.0",
+                "browserify-sign": "^4.0.0",
+                "create-ecdh": "^4.0.0",
+                "create-hash": "^1.1.0",
+                "create-hmac": "^1.1.0",
+                "diffie-hellman": "^5.0.0",
+                "inherits": "^2.0.1",
+                "pbkdf2": "^3.0.3",
+                "public-encrypt": "^4.0.0",
+                "randombytes": "^2.0.0",
+                "randomfill": "^1.0.3"
+            }
+        },
+        "css-color-names": {
+            "version": "0.0.4",
+            "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+            "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+            "dev": true
+        },
+        "css-declaration-sorter": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+            "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+            "dev": true,
+            "requires": {
+                "postcss": "^7.0.1",
+                "timsort": "^0.3.0"
+            }
+        },
+        "css-modules-loader-core": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz",
+            "integrity": "sha1-WQhmgpShvs0mGuCkziGwtVHyHRY=",
+            "dev": true,
+            "requires": {
+                "icss-replace-symbols": "1.1.0",
+                "postcss": "6.0.1",
+                "postcss-modules-extract-imports": "1.1.0",
+                "postcss-modules-local-by-default": "1.2.0",
+                "postcss-modules-scope": "1.1.0",
+                "postcss-modules-values": "1.3.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+                    "dev": true
+                },
+                "ansi-styles": {
+                    "version": "2.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+                    "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+                    "dev": true
+                },
+                "chalk": {
+                    "version": "1.1.3",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+                    "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-styles": "^2.2.1",
+                        "escape-string-regexp": "^1.0.2",
+                        "has-ansi": "^2.0.0",
+                        "strip-ansi": "^3.0.0",
+                        "supports-color": "^2.0.0"
+                    },
+                    "dependencies": {
+                        "supports-color": {
+                            "version": "2.0.0",
+                            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+                            "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+                            "dev": true
+                        }
+                    }
+                },
+                "has-flag": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+                    "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+                    "dev": true
+                },
+                "postcss": {
+                    "version": "6.0.1",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
+                    "integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^1.1.3",
+                        "source-map": "^0.5.6",
+                        "supports-color": "^3.2.3"
+                    }
+                },
+                "source-map": {
+                    "version": "0.5.7",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+                    "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+                    "dev": true
+                },
+                "strip-ansi": {
+                    "version": "3.0.1",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^2.0.0"
+                    }
+                },
+                "supports-color": {
+                    "version": "3.2.3",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+                    "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^1.0.0"
+                    }
+                }
+            }
+        },
+        "css-select": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+            "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+            "dev": true,
+            "requires": {
+                "boolbase": "^1.0.0",
+                "css-what": "^3.2.1",
+                "domutils": "^1.7.0",
+                "nth-check": "^1.0.2"
+            }
+        },
+        "css-select-base-adapter": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+            "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+            "dev": true
+        },
+        "css-selector-tokenizer": {
+            "version": "0.7.3",
+            "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz",
+            "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==",
+            "dev": true,
+            "requires": {
+                "cssesc": "^3.0.0",
+                "fastparse": "^1.1.2"
+            }
+        },
+        "css-tree": {
+            "version": "1.0.0-alpha.37",
+            "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+            "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+            "dev": true,
+            "requires": {
+                "mdn-data": "2.0.4",
+                "source-map": "^0.6.1"
+            }
+        },
+        "css-what": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz",
+            "integrity": "sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg==",
+            "dev": true
+        },
+        "cssesc": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+            "dev": true
+        },
+        "cssnano": {
+            "version": "4.1.10",
+            "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+            "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+            "dev": true,
+            "requires": {
+                "cosmiconfig": "^5.0.0",
+                "cssnano-preset-default": "^4.0.7",
+                "is-resolvable": "^1.0.0",
+                "postcss": "^7.0.0"
+            }
+        },
+        "cssnano-preset-default": {
+            "version": "4.0.7",
+            "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+            "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+            "dev": true,
+            "requires": {
+                "css-declaration-sorter": "^4.0.1",
+                "cssnano-util-raw-cache": "^4.0.1",
+                "postcss": "^7.0.0",
+                "postcss-calc": "^7.0.1",
+                "postcss-colormin": "^4.0.3",
+                "postcss-convert-values": "^4.0.1",
+                "postcss-discard-comments": "^4.0.2",
+                "postcss-discard-duplicates": "^4.0.2",
+                "postcss-discard-empty": "^4.0.1",
+                "postcss-discard-overridden": "^4.0.1",
+                "postcss-merge-longhand": "^4.0.11",
+                "postcss-merge-rules": "^4.0.3",
+                "postcss-minify-font-values": "^4.0.2",
+                "postcss-minify-gradients": "^4.0.2",
+                "postcss-minify-params": "^4.0.2",
+                "postcss-minify-selectors": "^4.0.2",
+                "postcss-normalize-charset": "^4.0.1",
+                "postcss-normalize-display-values": "^4.0.2",
+                "postcss-normalize-positions": "^4.0.2",
+                "postcss-normalize-repeat-style": "^4.0.2",
+                "postcss-normalize-string": "^4.0.2",
+                "postcss-normalize-timing-functions": "^4.0.2",
+                "postcss-normalize-unicode": "^4.0.1",
+                "postcss-normalize-url": "^4.0.1",
+                "postcss-normalize-whitespace": "^4.0.2",
+                "postcss-ordered-values": "^4.1.2",
+                "postcss-reduce-initial": "^4.0.3",
+                "postcss-reduce-transforms": "^4.0.2",
+                "postcss-svgo": "^4.0.2",
+                "postcss-unique-selectors": "^4.0.1"
+            }
+        },
+        "cssnano-util-get-arguments": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+            "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
+            "dev": true
+        },
+        "cssnano-util-get-match": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+            "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
+            "dev": true
+        },
+        "cssnano-util-raw-cache": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+            "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+            "dev": true,
+            "requires": {
+                "postcss": "^7.0.0"
+            }
+        },
+        "cssnano-util-same-parent": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+            "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
+            "dev": true
+        },
+        "csso": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
+            "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+            "dev": true,
+            "requires": {
+                "css-tree": "1.0.0-alpha.39"
+            },
+            "dependencies": {
+                "css-tree": {
+                    "version": "1.0.0-alpha.39",
+                    "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
+                    "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+                    "dev": true,
+                    "requires": {
+                        "mdn-data": "2.0.6",
+                        "source-map": "^0.6.1"
+                    }
+                },
+                "mdn-data": {
+                    "version": "2.0.6",
+                    "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
+                    "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+                    "dev": true
+                }
+            }
+        },
+        "cssom": {
+            "version": "0.3.8",
+            "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+            "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+            "dev": true
+        },
+        "cssstyle": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
+            "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
+            "dev": true,
+            "requires": {
+                "cssom": "0.3.x"
+            }
+        },
+        "dashdash": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+            "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+            "dev": true,
+            "requires": {
+                "assert-plus": "^1.0.0"
+            }
+        },
+        "data-urls": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
+            "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+            "dev": true,
+            "requires": {
+                "abab": "^2.0.0",
+                "whatwg-mimetype": "^2.2.0",
+                "whatwg-url": "^7.0.0"
+            }
+        },
+        "deasync": {
+            "version": "0.1.20",
+            "resolved": "https://registry.npmjs.org/deasync/-/deasync-0.1.20.tgz",
+            "integrity": "sha512-E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ==",
+            "dev": true,
+            "requires": {
+                "bindings": "^1.5.0",
+                "node-addon-api": "^1.7.1"
+            }
+        },
+        "debug": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+            "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+            "dev": true,
+            "requires": {
+                "ms": "^2.1.1"
+            }
+        },
+        "decode-uri-component": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+            "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+            "dev": true
+        },
+        "deep-is": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+            "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+            "dev": true
+        },
+        "defaults": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+            "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+            "dev": true,
+            "requires": {
+                "clone": "^1.0.2"
+            },
+            "dependencies": {
+                "clone": {
+                    "version": "1.0.4",
+                    "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+                    "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+                    "dev": true
+                }
+            }
+        },
+        "define-properties": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+            "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+            "dev": true,
+            "requires": {
+                "object-keys": "^1.0.12"
+            }
+        },
+        "define-property": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+            "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+            "dev": true,
+            "requires": {
+                "is-descriptor": "^1.0.2",
+                "isobject": "^3.0.1"
+            },
+            "dependencies": {
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "delayed-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+            "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+            "dev": true
+        },
+        "depd": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+            "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+            "dev": true
+        },
+        "des.js": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+            "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0"
+            }
+        },
+        "destroy": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+            "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+            "dev": true
+        },
+        "diffie-hellman": {
+            "version": "5.0.3",
+            "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+            "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.1.0",
+                "miller-rabin": "^4.0.0",
+                "randombytes": "^2.0.0"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "dom-serializer": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+            "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+            "dev": true,
+            "requires": {
+                "domelementtype": "^2.0.1",
+                "entities": "^2.0.0"
+            },
+            "dependencies": {
+                "domelementtype": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+                    "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+                    "dev": true
+                },
+                "entities": {
+                    "version": "2.0.3",
+                    "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+                    "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+                    "dev": true
+                }
+            }
+        },
+        "domain-browser": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+            "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+            "dev": true
+        },
+        "domelementtype": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+            "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+            "dev": true
+        },
+        "domexception": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+            "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+            "dev": true,
+            "requires": {
+                "webidl-conversions": "^4.0.2"
+            }
+        },
+        "domhandler": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+            "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+            "dev": true,
+            "requires": {
+                "domelementtype": "1"
+            }
+        },
+        "domutils": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+            "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+            "dev": true,
+            "requires": {
+                "dom-serializer": "0",
+                "domelementtype": "1"
+            }
+        },
+        "dot-prop": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
+            "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
+            "dev": true,
+            "requires": {
+                "is-obj": "^2.0.0"
+            }
+        },
+        "dotenv": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz",
+            "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow==",
+            "dev": true
+        },
+        "dotenv-expand": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
+            "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
+            "dev": true
+        },
+        "duplexer2": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+            "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+            "dev": true,
+            "requires": {
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "ecc-jsbn": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+            "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+            "dev": true,
+            "requires": {
+                "jsbn": "~0.1.0",
+                "safer-buffer": "^2.1.0"
+            }
+        },
+        "ee-first": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+            "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+            "dev": true
+        },
+        "electron-to-chromium": {
+            "version": "1.3.557",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.557.tgz",
+            "integrity": "sha512-M2p3nWulBqSEIisykYUVYnaSuRikHvxv8Wf209/Vg/sjrOew12hBQv2JvNGy+i+eDeJU9uQ3dbUbCCQ/CkudEg==",
+            "dev": true
+        },
+        "elliptic": {
+            "version": "6.5.3",
+            "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+            "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.4.0",
+                "brorand": "^1.0.1",
+                "hash.js": "^1.0.0",
+                "hmac-drbg": "^1.0.0",
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0",
+                "minimalistic-crypto-utils": "^1.0.0"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+            "dev": true
+        },
+        "entities": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+            "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+            "dev": true
+        },
+        "envinfo": {
+            "version": "7.7.3",
+            "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.7.3.tgz",
+            "integrity": "sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==",
+            "dev": true
+        },
+        "error-ex": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+            "dev": true,
+            "requires": {
+                "is-arrayish": "^0.2.1"
+            }
+        },
+        "es-abstract": {
+            "version": "1.17.6",
+            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+            "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+            "dev": true,
+            "requires": {
+                "es-to-primitive": "^1.2.1",
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.1",
+                "is-callable": "^1.2.0",
+                "is-regex": "^1.1.0",
+                "object-inspect": "^1.7.0",
+                "object-keys": "^1.1.1",
+                "object.assign": "^4.1.0",
+                "string.prototype.trimend": "^1.0.1",
+                "string.prototype.trimstart": "^1.0.1"
+            }
+        },
+        "es-to-primitive": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+            "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+            "dev": true,
+            "requires": {
+                "is-callable": "^1.1.4",
+                "is-date-object": "^1.0.1",
+                "is-symbol": "^1.0.2"
+            }
+        },
+        "escalade": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz",
+            "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==",
+            "dev": true
+        },
+        "escape-html": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+            "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+            "dev": true
+        },
+        "escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+            "dev": true
+        },
+        "escodegen": {
+            "version": "1.9.1",
+            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
+            "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
+            "dev": true,
+            "requires": {
+                "esprima": "^3.1.3",
+                "estraverse": "^4.2.0",
+                "esutils": "^2.0.2",
+                "optionator": "^0.8.1",
+                "source-map": "~0.6.1"
+            }
+        },
+        "esprima": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+            "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+            "dev": true
+        },
+        "estraverse": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+            "dev": true
+        },
+        "esutils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+            "dev": true
+        },
+        "etag": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+            "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+            "dev": true
+        },
+        "events": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+            "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+            "dev": true
+        },
+        "evp_bytestokey": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+            "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+            "dev": true,
+            "requires": {
+                "md5.js": "^1.3.4",
+                "safe-buffer": "^5.1.1"
+            }
+        },
+        "expand-brackets": {
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+            "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+            "dev": true,
+            "requires": {
+                "debug": "^2.3.3",
+                "define-property": "^0.2.5",
+                "extend-shallow": "^2.0.1",
+                "posix-character-classes": "^0.1.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.1"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                },
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                    "dev": true
+                }
+            }
+        },
+        "extend": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+            "dev": true
+        },
+        "extend-shallow": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+            "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+            "dev": true,
+            "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+            },
+            "dependencies": {
+                "is-extendable": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+                    "dev": true,
+                    "requires": {
+                        "is-plain-object": "^2.0.4"
+                    }
+                }
+            }
+        },
+        "extglob": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+            "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+            "dev": true,
+            "requires": {
+                "array-unique": "^0.3.2",
+                "define-property": "^1.0.0",
+                "expand-brackets": "^2.1.4",
+                "extend-shallow": "^2.0.1",
+                "fragment-cache": "^0.2.1",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^1.0.0"
+                    }
+                },
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "extsprintf": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+            "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+            "dev": true
+        },
+        "falafel": {
+            "version": "2.2.4",
+            "resolved": "https://registry.npmjs.org/falafel/-/falafel-2.2.4.tgz",
+            "integrity": "sha512-0HXjo8XASWRmsS0X1EkhwEMZaD3Qvp7FfURwjLKjG1ghfRm/MGZl2r4cWUTv41KdNghTw4OUMmVtdGQp3+H+uQ==",
+            "dev": true,
+            "requires": {
+                "acorn": "^7.1.1",
+                "foreach": "^2.0.5",
+                "isarray": "^2.0.1",
+                "object-keys": "^1.0.6"
+            },
+            "dependencies": {
+                "isarray": {
+                    "version": "2.0.5",
+                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+                    "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+                    "dev": true
+                }
+            }
+        },
+        "fast-deep-equal": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+            "dev": true
+        },
+        "fast-glob": {
+            "version": "2.2.7",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
+            "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+            "dev": true,
+            "requires": {
+                "@mrmlnc/readdir-enhanced": "^2.2.1",
+                "@nodelib/fs.stat": "^1.1.2",
+                "glob-parent": "^3.1.0",
+                "is-glob": "^4.0.0",
+                "merge2": "^1.2.3",
+                "micromatch": "^3.1.10"
+            }
+        },
+        "fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true
+        },
+        "fast-levenshtein": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+            "dev": true
+        },
+        "fastparse": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
+            "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
+            "dev": true
+        },
+        "file-uri-to-path": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+            "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+            "dev": true
+        },
+        "filesize": {
+            "version": "3.6.1",
+            "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
+            "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
+            "dev": true
+        },
+        "fill-range": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+            "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+            "dev": true,
+            "requires": {
+                "extend-shallow": "^2.0.1",
+                "is-number": "^3.0.0",
+                "repeat-string": "^1.6.1",
+                "to-regex-range": "^2.1.0"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "for-in": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+            "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+            "dev": true
+        },
+        "foreach": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+            "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+            "dev": true
+        },
+        "forever-agent": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+            "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+            "dev": true
+        },
+        "form-data": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+            "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+            "dev": true,
+            "requires": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.6",
+                "mime-types": "^2.1.12"
+            }
+        },
+        "fragment-cache": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+            "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+            "dev": true,
+            "requires": {
+                "map-cache": "^0.2.2"
+            }
+        },
+        "fresh": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+            "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+            "dev": true
+        },
+        "fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+            "dev": true
+        },
+        "fsevents": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+            "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "bindings": "^1.5.0",
+                "nan": "^2.12.1"
+            }
+        },
+        "function-bind": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+            "dev": true
+        },
+        "gensync": {
+            "version": "1.0.0-beta.1",
+            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+            "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+            "dev": true
+        },
+        "get-port": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
+            "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=",
+            "dev": true
+        },
+        "get-value": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+            "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+            "dev": true
+        },
+        "getpass": {
+            "version": "0.1.7",
+            "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+            "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+            "dev": true,
+            "requires": {
+                "assert-plus": "^1.0.0"
+            }
+        },
+        "glob": {
+            "version": "7.1.6",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+            "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+            "dev": true,
+            "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            }
+        },
+        "glob-parent": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+            "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+            "dev": true,
+            "requires": {
+                "is-glob": "^3.1.0",
+                "path-dirname": "^1.0.0"
+            },
+            "dependencies": {
+                "is-glob": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+                    "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+                    "dev": true,
+                    "requires": {
+                        "is-extglob": "^2.1.0"
+                    }
+                }
+            }
+        },
+        "glob-to-regexp": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+            "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+            "dev": true
+        },
+        "globals": {
+            "version": "11.12.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+            "dev": true
+        },
+        "graceful-fs": {
+            "version": "4.2.4",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+            "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+            "dev": true
+        },
+        "grapheme-breaker": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/grapheme-breaker/-/grapheme-breaker-0.3.2.tgz",
+            "integrity": "sha1-W55reMODJFLSuiuxy4MPlidkEKw=",
+            "dev": true,
+            "requires": {
+                "brfs": "^1.2.0",
+                "unicode-trie": "^0.3.1"
+            }
+        },
+        "har-schema": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+            "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+            "dev": true
+        },
+        "har-validator": {
+            "version": "5.1.5",
+            "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+            "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+            "dev": true,
+            "requires": {
+                "ajv": "^6.12.3",
+                "har-schema": "^2.0.0"
+            }
+        },
+        "has": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+            "dev": true,
+            "requires": {
+                "function-bind": "^1.1.1"
+            }
+        },
+        "has-ansi": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+            "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+            "dev": true,
+            "requires": {
+                "ansi-regex": "^2.0.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+                    "dev": true
+                }
+            }
+        },
+        "has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+            "dev": true
+        },
+        "has-symbols": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+            "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+            "dev": true
+        },
+        "has-value": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+            "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+            "dev": true,
+            "requires": {
+                "get-value": "^2.0.6",
+                "has-values": "^1.0.0",
+                "isobject": "^3.0.0"
+            }
+        },
+        "has-values": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+            "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+            "dev": true,
+            "requires": {
+                "is-number": "^3.0.0",
+                "kind-of": "^4.0.0"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+                    "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "hash-base": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+            "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.4",
+                "readable-stream": "^3.6.0",
+                "safe-buffer": "^5.2.0"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "3.6.0",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "^2.0.3",
+                        "string_decoder": "^1.1.1",
+                        "util-deprecate": "^1.0.1"
+                    }
+                },
+                "safe-buffer": {
+                    "version": "5.2.1",
+                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+                    "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+                    "dev": true
+                }
+            }
+        },
+        "hash.js": {
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+            "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.3",
+                "minimalistic-assert": "^1.0.1"
+            }
+        },
+        "hex-color-regex": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
+            "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
+            "dev": true
+        },
+        "hmac-drbg": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+            "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+            "dev": true,
+            "requires": {
+                "hash.js": "^1.0.3",
+                "minimalistic-assert": "^1.0.0",
+                "minimalistic-crypto-utils": "^1.0.1"
+            }
+        },
+        "hosted-git-info": {
+            "version": "2.8.8",
+            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+            "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+            "dev": true
+        },
+        "hsl-regex": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
+            "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
+            "dev": true
+        },
+        "hsla-regex": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
+            "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
+            "dev": true
+        },
+        "html-comment-regex": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+            "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
+            "dev": true
+        },
+        "html-encoding-sniffer": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+            "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+            "dev": true,
+            "requires": {
+                "whatwg-encoding": "^1.0.1"
+            }
+        },
+        "html-tags": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-1.2.0.tgz",
+            "integrity": "sha1-x43mW1Zjqll5id0rerSSANfk25g=",
+            "dev": true
+        },
+        "htmlnano": {
+            "version": "0.2.6",
+            "resolved": "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.6.tgz",
+            "integrity": "sha512-HUY/99maFsWX2LRoGJpZ/8QRLCkyY0UU1El3wgLLFAHQlD3mCxCJJNcWJk5SBqaU49MLhIWVDW6cGBeuemvaPQ==",
+            "dev": true,
+            "requires": {
+                "cssnano": "^4.1.10",
+                "normalize-html-whitespace": "^1.0.0",
+                "posthtml": "^0.13.1",
+                "posthtml-render": "^1.2.2",
+                "purgecss": "^2.3.0",
+                "svgo": "^1.3.2",
+                "terser": "^4.8.0",
+                "uncss": "^0.17.3"
+            },
+            "dependencies": {
+                "posthtml": {
+                    "version": "0.13.3",
+                    "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.13.3.tgz",
+                    "integrity": "sha512-5NL2bBc4ihAyoYnY0EAQrFQbJNE1UdvgC1wjYts0hph7jYeU2fa5ki3/9U45ce9V6M1vLMEgUX2NXe/bYL+bCQ==",
+                    "dev": true,
+                    "requires": {
+                        "posthtml-parser": "^0.5.0",
+                        "posthtml-render": "^1.2.3"
+                    }
+                },
+                "posthtml-parser": {
+                    "version": "0.5.0",
+                    "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.5.0.tgz",
+                    "integrity": "sha512-BsZFAqOeX9lkJJPKG2JmGgtm6t++WibU7FeS40FNNGZ1KS2szRSRQ8Wr2JLvikDgAecrQ/9V4sjugTAin2+KVw==",
+                    "dev": true,
+                    "requires": {
+                        "htmlparser2": "^3.9.2"
+                    }
+                },
+                "terser": {
+                    "version": "4.8.0",
+                    "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+                    "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+                    "dev": true,
+                    "requires": {
+                        "commander": "^2.20.0",
+                        "source-map": "~0.6.1",
+                        "source-map-support": "~0.5.12"
+                    }
+                }
+            }
+        },
+        "htmlparser2": {
+            "version": "3.10.1",
+            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+            "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+            "dev": true,
+            "requires": {
+                "domelementtype": "^1.3.1",
+                "domhandler": "^2.3.0",
+                "domutils": "^1.5.1",
+                "entities": "^1.1.1",
+                "inherits": "^2.0.1",
+                "readable-stream": "^3.1.1"
+            },
+            "dependencies": {
+                "readable-stream": {
+                    "version": "3.6.0",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "^2.0.3",
+                        "string_decoder": "^1.1.1",
+                        "util-deprecate": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "http-errors": {
+            "version": "1.7.3",
+            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
+            "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+            "dev": true,
+            "requires": {
+                "depd": "~1.1.2",
+                "inherits": "2.0.4",
+                "setprototypeof": "1.1.1",
+                "statuses": ">= 1.5.0 < 2",
+                "toidentifier": "1.0.0"
+            }
+        },
+        "http-signature": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+            "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+            "dev": true,
+            "requires": {
+                "assert-plus": "^1.0.0",
+                "jsprim": "^1.2.2",
+                "sshpk": "^1.7.0"
+            }
+        },
+        "https-browserify": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+            "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+            "dev": true
+        },
+        "iconv-lite": {
+            "version": "0.4.24",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "dev": true,
+            "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+            }
+        },
+        "icss-replace-symbols": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+            "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
+            "dev": true
+        },
+        "ieee754": {
+            "version": "1.1.13",
+            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+            "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+            "dev": true
+        },
+        "import-fresh": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+            "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+            "dev": true,
+            "requires": {
+                "caller-path": "^2.0.0",
+                "resolve-from": "^3.0.0"
+            }
+        },
+        "indexes-of": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+            "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+            "dev": true
+        },
+        "inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+            "dev": true,
+            "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
+        },
+        "invariant": {
+            "version": "2.2.4",
+            "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+            "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+            "dev": true,
+            "requires": {
+                "loose-envify": "^1.0.0"
+            }
+        },
+        "is-absolute-url": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+            "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+            "dev": true
+        },
+        "is-accessor-descriptor": {
+            "version": "0.1.6",
+            "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+            "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+            "dev": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "is-arrayish": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+            "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+            "dev": true
+        },
+        "is-binary-path": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+            "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+            "dev": true,
+            "requires": {
+                "binary-extensions": "^1.0.0"
+            }
+        },
+        "is-buffer": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+            "dev": true
+        },
+        "is-callable": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+            "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+            "dev": true
+        },
+        "is-color-stop": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
+            "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
+            "dev": true,
+            "requires": {
+                "css-color-names": "^0.0.4",
+                "hex-color-regex": "^1.1.0",
+                "hsl-regex": "^1.0.0",
+                "hsla-regex": "^1.0.0",
+                "rgb-regex": "^1.0.1",
+                "rgba-regex": "^1.0.0"
+            }
+        },
+        "is-data-descriptor": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+            "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+            "dev": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "is-date-object": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+            "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+            "dev": true
+        },
+        "is-descriptor": {
+            "version": "0.1.6",
+            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+            "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+            "dev": true,
+            "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+                    "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+                    "dev": true
+                }
+            }
+        },
+        "is-directory": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+            "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+            "dev": true
+        },
+        "is-extendable": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+            "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+            "dev": true
+        },
+        "is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+            "dev": true
+        },
+        "is-glob": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+            "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+            "dev": true,
+            "requires": {
+                "is-extglob": "^2.1.1"
+            }
+        },
+        "is-html": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/is-html/-/is-html-1.1.0.tgz",
+            "integrity": "sha1-4E8cGNOUhRETlvmgJz6rUa8hhGQ=",
+            "dev": true,
+            "requires": {
+                "html-tags": "^1.0.0"
+            }
+        },
+        "is-number": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+            "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+            "dev": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "is-obj": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+            "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+            "dev": true
+        },
+        "is-plain-object": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+            "dev": true,
+            "requires": {
+                "isobject": "^3.0.1"
+            }
+        },
+        "is-regex": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+            "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+            "dev": true,
+            "requires": {
+                "has-symbols": "^1.0.1"
+            }
+        },
+        "is-resolvable": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+            "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+            "dev": true
+        },
+        "is-svg": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
+            "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
+            "dev": true,
+            "requires": {
+                "html-comment-regex": "^1.1.0"
+            }
+        },
+        "is-symbol": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+            "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+            "dev": true,
+            "requires": {
+                "has-symbols": "^1.0.1"
+            }
+        },
+        "is-typedarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+            "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+            "dev": true
+        },
+        "is-url": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
+            "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
+            "dev": true
+        },
+        "is-windows": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+            "dev": true
+        },
+        "is-wsl": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+            "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+            "dev": true
+        },
+        "isarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+            "dev": true
+        },
+        "isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+            "dev": true
+        },
+        "isobject": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+            "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+            "dev": true
+        },
+        "isstream": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+            "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+            "dev": true
+        },
+        "jquery": {
+            "version": "3.5.1",
+            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+            "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+        },
+        "js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+            "dev": true
+        },
+        "js-yaml": {
+            "version": "3.14.0",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+            "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+            "dev": true,
+            "requires": {
+                "argparse": "^1.0.7",
+                "esprima": "^4.0.0"
+            },
+            "dependencies": {
+                "esprima": {
+                    "version": "4.0.1",
+                    "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+                    "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+                    "dev": true
+                }
+            }
+        },
+        "jsbn": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+            "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+            "dev": true
+        },
+        "jsdom": {
+            "version": "14.1.0",
+            "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-14.1.0.tgz",
+            "integrity": "sha512-O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng==",
+            "dev": true,
+            "requires": {
+                "abab": "^2.0.0",
+                "acorn": "^6.0.4",
+                "acorn-globals": "^4.3.0",
+                "array-equal": "^1.0.0",
+                "cssom": "^0.3.4",
+                "cssstyle": "^1.1.1",
+                "data-urls": "^1.1.0",
+                "domexception": "^1.0.1",
+                "escodegen": "^1.11.0",
+                "html-encoding-sniffer": "^1.0.2",
+                "nwsapi": "^2.1.3",
+                "parse5": "5.1.0",
+                "pn": "^1.1.0",
+                "request": "^2.88.0",
+                "request-promise-native": "^1.0.5",
+                "saxes": "^3.1.9",
+                "symbol-tree": "^3.2.2",
+                "tough-cookie": "^2.5.0",
+                "w3c-hr-time": "^1.0.1",
+                "w3c-xmlserializer": "^1.1.2",
+                "webidl-conversions": "^4.0.2",
+                "whatwg-encoding": "^1.0.5",
+                "whatwg-mimetype": "^2.3.0",
+                "whatwg-url": "^7.0.0",
+                "ws": "^6.1.2",
+                "xml-name-validator": "^3.0.0"
+            },
+            "dependencies": {
+                "acorn": {
+                    "version": "6.4.1",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+                    "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+                    "dev": true
+                },
+                "escodegen": {
+                    "version": "1.14.3",
+                    "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+                    "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+                    "dev": true,
+                    "requires": {
+                        "esprima": "^4.0.1",
+                        "estraverse": "^4.2.0",
+                        "esutils": "^2.0.2",
+                        "optionator": "^0.8.1",
+                        "source-map": "~0.6.1"
+                    }
+                },
+                "esprima": {
+                    "version": "4.0.1",
+                    "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+                    "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+                    "dev": true
+                },
+                "ws": {
+                    "version": "6.2.1",
+                    "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+                    "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+                    "dev": true,
+                    "requires": {
+                        "async-limiter": "~1.0.0"
+                    }
+                }
+            }
+        },
+        "jsesc": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+            "dev": true
+        },
+        "json-parse-better-errors": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+            "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+            "dev": true
+        },
+        "json-schema": {
+            "version": "0.2.3",
+            "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+            "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+            "dev": true
+        },
+        "json-schema-traverse": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+            "dev": true
+        },
+        "json-stringify-safe": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+            "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+            "dev": true
+        },
+        "json5": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+            "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+            "dev": true,
+            "requires": {
+                "minimist": "^1.2.0"
+            }
+        },
+        "jsprim": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+            "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+            "dev": true,
+            "requires": {
+                "assert-plus": "1.0.0",
+                "extsprintf": "1.3.0",
+                "json-schema": "0.2.3",
+                "verror": "1.10.0"
+            }
+        },
+        "kind-of": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+            "dev": true
+        },
+        "leven": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+            "dev": true
+        },
+        "levenary": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+            "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+            "dev": true,
+            "requires": {
+                "leven": "^3.1.0"
+            }
+        },
+        "levn": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+            "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+            "dev": true,
+            "requires": {
+                "prelude-ls": "~1.1.2",
+                "type-check": "~0.3.2"
+            }
+        },
+        "load-json-file": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+            "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+            "dev": true,
+            "requires": {
+                "graceful-fs": "^4.1.2",
+                "parse-json": "^4.0.0",
+                "pify": "^3.0.0",
+                "strip-bom": "^3.0.0"
+            }
+        },
+        "lodash": {
+            "version": "4.17.20",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+            "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+            "dev": true
+        },
+        "lodash.clone": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
+            "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=",
+            "dev": true
+        },
+        "lodash.memoize": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+            "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+            "dev": true
+        },
+        "lodash.sortby": {
+            "version": "4.7.0",
+            "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+            "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+            "dev": true
+        },
+        "lodash.uniq": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+            "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+            "dev": true
+        },
+        "log-symbols": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+            "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+            "dev": true,
+            "requires": {
+                "chalk": "^2.0.1"
+            }
+        },
+        "loose-envify": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+            "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+            "dev": true,
+            "requires": {
+                "js-tokens": "^3.0.0 || ^4.0.0"
+            }
+        },
+        "magic-string": {
+            "version": "0.22.5",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+            "integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+            "dev": true,
+            "requires": {
+                "vlq": "^0.2.2"
+            }
+        },
+        "map-cache": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+            "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+            "dev": true
+        },
+        "map-visit": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+            "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+            "dev": true,
+            "requires": {
+                "object-visit": "^1.0.0"
+            }
+        },
+        "md5.js": {
+            "version": "1.3.5",
+            "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+            "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+            "dev": true,
+            "requires": {
+                "hash-base": "^3.0.0",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "mdn-data": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+            "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+            "dev": true
+        },
+        "memorystream": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+            "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
+            "dev": true
+        },
+        "merge-source-map": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",
+            "integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=",
+            "dev": true,
+            "requires": {
+                "source-map": "^0.5.6"
+            },
+            "dependencies": {
+                "source-map": {
+                    "version": "0.5.7",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+                    "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+                    "dev": true
+                }
+            }
+        },
+        "merge2": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "dev": true
+        },
+        "micromatch": {
+            "version": "3.1.10",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+            "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+            "dev": true,
+            "requires": {
+                "arr-diff": "^4.0.0",
+                "array-unique": "^0.3.2",
+                "braces": "^2.3.1",
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "extglob": "^2.0.4",
+                "fragment-cache": "^0.2.1",
+                "kind-of": "^6.0.2",
+                "nanomatch": "^1.2.9",
+                "object.pick": "^1.3.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.2"
+            }
+        },
+        "miller-rabin": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+            "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.0.0",
+                "brorand": "^1.0.1"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "mime": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+            "dev": true
+        },
+        "mime-db": {
+            "version": "1.44.0",
+            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+            "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+            "dev": true
+        },
+        "mime-types": {
+            "version": "2.1.27",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+            "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+            "dev": true,
+            "requires": {
+                "mime-db": "1.44.0"
+            }
+        },
+        "mimic-fn": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+            "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+            "dev": true
+        },
+        "minimalistic-assert": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+            "dev": true
+        },
+        "minimalistic-crypto-utils": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+            "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+            "dev": true
+        },
+        "minimatch": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "dev": true,
+            "requires": {
+                "brace-expansion": "^1.1.7"
+            }
+        },
+        "minimist": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+            "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+            "dev": true
+        },
+        "mixin-deep": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+            "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+            "dev": true,
+            "requires": {
+                "for-in": "^1.0.2",
+                "is-extendable": "^1.0.1"
+            },
+            "dependencies": {
+                "is-extendable": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+                    "dev": true,
+                    "requires": {
+                        "is-plain-object": "^2.0.4"
+                    }
+                }
+            }
+        },
+        "mkdirp": {
+            "version": "0.5.5",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+            "dev": true,
+            "requires": {
+                "minimist": "^1.2.5"
+            }
+        },
+        "ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+            "dev": true
+        },
+        "nan": {
+            "version": "2.14.1",
+            "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+            "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+            "dev": true,
+            "optional": true
+        },
+        "nanomatch": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+            "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+            "dev": true,
+            "requires": {
+                "arr-diff": "^4.0.0",
+                "array-unique": "^0.3.2",
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "fragment-cache": "^0.2.1",
+                "is-windows": "^1.0.2",
+                "kind-of": "^6.0.2",
+                "object.pick": "^1.3.0",
+                "regex-not": "^1.0.0",
+                "snapdragon": "^0.8.1",
+                "to-regex": "^3.0.1"
+            }
+        },
+        "nice-try": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+            "dev": true
+        },
+        "node-addon-api": {
+            "version": "1.7.2",
+            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
+            "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
+            "dev": true
+        },
+        "node-forge": {
+            "version": "0.7.6",
+            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz",
+            "integrity": "sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==",
+            "dev": true
+        },
+        "node-libs-browser": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+            "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+            "dev": true,
+            "requires": {
+                "assert": "^1.1.1",
+                "browserify-zlib": "^0.2.0",
+                "buffer": "^4.3.0",
+                "console-browserify": "^1.1.0",
+                "constants-browserify": "^1.0.0",
+                "crypto-browserify": "^3.11.0",
+                "domain-browser": "^1.1.1",
+                "events": "^3.0.0",
+                "https-browserify": "^1.0.0",
+                "os-browserify": "^0.3.0",
+                "path-browserify": "0.0.1",
+                "process": "^0.11.10",
+                "punycode": "^1.2.4",
+                "querystring-es3": "^0.2.0",
+                "readable-stream": "^2.3.3",
+                "stream-browserify": "^2.0.1",
+                "stream-http": "^2.7.2",
+                "string_decoder": "^1.0.0",
+                "timers-browserify": "^2.0.4",
+                "tty-browserify": "0.0.0",
+                "url": "^0.11.0",
+                "util": "^0.11.0",
+                "vm-browserify": "^1.0.1"
+            },
+            "dependencies": {
+                "punycode": {
+                    "version": "1.4.1",
+                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+                    "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+                    "dev": true
+                }
+            }
+        },
+        "node-releases": {
+            "version": "1.1.60",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz",
+            "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==",
+            "dev": true
+        },
+        "normalize-html-whitespace": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-1.0.0.tgz",
+            "integrity": "sha512-9ui7CGtOOlehQu0t/OhhlmDyc71mKVlv+4vF+me4iZLPrNtRL2xoquEdfZxasC/bdQi/Hr3iTrpyRKIG+ocabA==",
+            "dev": true
+        },
+        "normalize-package-data": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+            "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+            "dev": true,
+            "requires": {
+                "hosted-git-info": "^2.1.4",
+                "resolve": "^1.10.0",
+                "semver": "2 || 3 || 4 || 5",
+                "validate-npm-package-license": "^3.0.1"
+            }
+        },
+        "normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "dev": true
+        },
+        "normalize-url": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+            "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+            "dev": true
+        },
+        "npm-run-all": {
+            "version": "4.1.5",
+            "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
+            "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
+            "dev": true,
+            "requires": {
+                "ansi-styles": "^3.2.1",
+                "chalk": "^2.4.1",
+                "cross-spawn": "^6.0.5",
+                "memorystream": "^0.3.1",
+                "minimatch": "^3.0.4",
+                "pidtree": "^0.3.0",
+                "read-pkg": "^3.0.0",
+                "shell-quote": "^1.6.1",
+                "string.prototype.padend": "^3.0.0"
+            }
+        },
+        "nth-check": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+            "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+            "dev": true,
+            "requires": {
+                "boolbase": "~1.0.0"
+            }
+        },
+        "nwsapi": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+            "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+            "dev": true
+        },
+        "oauth-sign": {
+            "version": "0.9.0",
+            "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+            "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+            "dev": true
+        },
+        "object-assign": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+            "dev": true
+        },
+        "object-copy": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+            "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+            "dev": true,
+            "requires": {
+                "copy-descriptor": "^0.1.0",
+                "define-property": "^0.2.5",
+                "kind-of": "^3.0.3"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                },
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "object-inspect": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+            "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+            "dev": true
+        },
+        "object-keys": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+            "dev": true
+        },
+        "object-visit": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+            "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+            "dev": true,
+            "requires": {
+                "isobject": "^3.0.0"
+            }
+        },
+        "object.assign": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+            "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.2",
+                "function-bind": "^1.1.1",
+                "has-symbols": "^1.0.0",
+                "object-keys": "^1.0.11"
+            }
+        },
+        "object.getownpropertydescriptors": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+            "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.0-next.1"
+            }
+        },
+        "object.pick": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+            "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+            "dev": true,
+            "requires": {
+                "isobject": "^3.0.1"
+            }
+        },
+        "object.values": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+            "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.0-next.1",
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3"
+            }
+        },
+        "on-finished": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+            "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+            "dev": true,
+            "requires": {
+                "ee-first": "1.1.1"
+            }
+        },
+        "once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+            "dev": true,
+            "requires": {
+                "wrappy": "1"
+            }
+        },
+        "onetime": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+            "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+            "dev": true,
+            "requires": {
+                "mimic-fn": "^1.0.0"
+            }
+        },
+        "opn": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+            "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+            "dev": true,
+            "requires": {
+                "is-wsl": "^1.1.0"
+            }
+        },
+        "optionator": {
+            "version": "0.8.3",
+            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+            "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+            "dev": true,
+            "requires": {
+                "deep-is": "~0.1.3",
+                "fast-levenshtein": "~2.0.6",
+                "levn": "~0.3.0",
+                "prelude-ls": "~1.1.2",
+                "type-check": "~0.3.2",
+                "word-wrap": "~1.2.3"
+            }
+        },
+        "ora": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/ora/-/ora-2.1.0.tgz",
+            "integrity": "sha512-hNNlAd3gfv/iPmsNxYoAPLvxg7HuPozww7fFonMZvL84tP6Ox5igfk5j/+a9rtJJwqMgKK+JgWsAQik5o0HTLA==",
+            "dev": true,
+            "requires": {
+                "chalk": "^2.3.1",
+                "cli-cursor": "^2.1.0",
+                "cli-spinners": "^1.1.0",
+                "log-symbols": "^2.2.0",
+                "strip-ansi": "^4.0.0",
+                "wcwidth": "^1.0.1"
+            }
+        },
+        "os-browserify": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+            "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+            "dev": true
+        },
+        "pako": {
+            "version": "0.2.9",
+            "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+            "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
+            "dev": true
+        },
+        "parcel-bundler": {
+            "version": "1.12.4",
+            "resolved": "https://registry.npmjs.org/parcel-bundler/-/parcel-bundler-1.12.4.tgz",
+            "integrity": "sha512-G+iZGGiPEXcRzw0fiRxWYCKxdt/F7l9a0xkiU4XbcVRJCSlBnioWEwJMutOCCpoQmaQtjB4RBHDGIHN85AIhLQ==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.0.0",
+                "@babel/core": "^7.4.4",
+                "@babel/generator": "^7.4.4",
+                "@babel/parser": "^7.4.4",
+                "@babel/plugin-transform-flow-strip-types": "^7.4.4",
+                "@babel/plugin-transform-modules-commonjs": "^7.4.4",
+                "@babel/plugin-transform-react-jsx": "^7.0.0",
+                "@babel/preset-env": "^7.4.4",
+                "@babel/runtime": "^7.4.4",
+                "@babel/template": "^7.4.4",
+                "@babel/traverse": "^7.4.4",
+                "@babel/types": "^7.4.4",
+                "@iarna/toml": "^2.2.0",
+                "@parcel/fs": "^1.11.0",
+                "@parcel/logger": "^1.11.1",
+                "@parcel/utils": "^1.11.0",
+                "@parcel/watcher": "^1.12.1",
+                "@parcel/workers": "^1.11.0",
+                "ansi-to-html": "^0.6.4",
+                "babylon-walk": "^1.0.2",
+                "browserslist": "^4.1.0",
+                "chalk": "^2.1.0",
+                "clone": "^2.1.1",
+                "command-exists": "^1.2.6",
+                "commander": "^2.11.0",
+                "core-js": "^2.6.5",
+                "cross-spawn": "^6.0.4",
+                "css-modules-loader-core": "^1.1.0",
+                "cssnano": "^4.0.0",
+                "deasync": "^0.1.14",
+                "dotenv": "^5.0.0",
+                "dotenv-expand": "^5.1.0",
+                "envinfo": "^7.3.1",
+                "fast-glob": "^2.2.2",
+                "filesize": "^3.6.0",
+                "get-port": "^3.2.0",
+                "htmlnano": "^0.2.2",
+                "is-glob": "^4.0.0",
+                "is-url": "^1.2.2",
+                "js-yaml": "^3.10.0",
+                "json5": "^1.0.1",
+                "micromatch": "^3.0.4",
+                "mkdirp": "^0.5.1",
+                "node-forge": "^0.7.1",
+                "node-libs-browser": "^2.0.0",
+                "opn": "^5.1.0",
+                "postcss": "^7.0.11",
+                "postcss-value-parser": "^3.3.1",
+                "posthtml": "^0.11.2",
+                "posthtml-parser": "^0.4.0",
+                "posthtml-render": "^1.1.3",
+                "resolve": "^1.4.0",
+                "semver": "^5.4.1",
+                "serialize-to-js": "^3.0.0",
+                "serve-static": "^1.12.4",
+                "source-map": "0.6.1",
+                "terser": "^3.7.3",
+                "v8-compile-cache": "^2.0.0",
+                "ws": "^5.1.1"
+            }
+        },
+        "parse-asn1": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+            "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+            "dev": true,
+            "requires": {
+                "asn1.js": "^5.2.0",
+                "browserify-aes": "^1.0.0",
+                "evp_bytestokey": "^1.0.0",
+                "pbkdf2": "^3.0.3",
+                "safe-buffer": "^5.1.1"
+            }
+        },
+        "parse-json": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+            "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+            "dev": true,
+            "requires": {
+                "error-ex": "^1.3.1",
+                "json-parse-better-errors": "^1.0.1"
+            }
+        },
+        "parse5": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+            "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
+            "dev": true
+        },
+        "parseurl": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+            "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+            "dev": true
+        },
+        "pascalcase": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+            "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+            "dev": true
+        },
+        "path-browserify": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+            "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+            "dev": true
+        },
+        "path-dirname": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+            "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+            "dev": true
+        },
+        "path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+            "dev": true
+        },
+        "path-key": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+            "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+            "dev": true
+        },
+        "path-parse": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+            "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+            "dev": true
+        },
+        "path-type": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+            "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+            "dev": true,
+            "requires": {
+                "pify": "^3.0.0"
+            }
+        },
+        "pbkdf2": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+            "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
+            "dev": true,
+            "requires": {
+                "create-hash": "^1.1.2",
+                "create-hmac": "^1.1.4",
+                "ripemd160": "^2.0.1",
+                "safe-buffer": "^5.0.1",
+                "sha.js": "^2.4.8"
+            }
+        },
+        "performance-now": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+            "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+            "dev": true
+        },
+        "physical-cpu-count": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/physical-cpu-count/-/physical-cpu-count-2.0.0.tgz",
+            "integrity": "sha1-GN4vl+S/epVRrXURlCtUlverpmA=",
+            "dev": true
+        },
+        "pidtree": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
+            "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
+            "dev": true
+        },
+        "pify": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+            "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+            "dev": true
+        },
+        "pn": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
+            "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
+            "dev": true
+        },
+        "popper.js": {
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+            "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
+        },
+        "posix-character-classes": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+            "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+            "dev": true
+        },
+        "postcss": {
+            "version": "7.0.32",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
+            "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+            "dev": true,
+            "requires": {
+                "chalk": "^2.4.2",
+                "source-map": "^0.6.1",
+                "supports-color": "^6.1.0"
+            },
+            "dependencies": {
+                "supports-color": {
+                    "version": "6.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+                    "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^3.0.0"
+                    }
+                }
+            }
+        },
+        "postcss-calc": {
+            "version": "7.0.4",
+            "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.4.tgz",
+            "integrity": "sha512-0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw==",
+            "dev": true,
+            "requires": {
+                "postcss": "^7.0.27",
+                "postcss-selector-parser": "^6.0.2",
+                "postcss-value-parser": "^4.0.2"
+            },
+            "dependencies": {
+                "postcss-value-parser": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+                    "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+                    "dev": true
+                }
+            }
+        },
+        "postcss-colormin": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+            "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.0.0",
+                "color": "^3.0.0",
+                "has": "^1.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-convert-values": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+            "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+            "dev": true,
+            "requires": {
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-discard-comments": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+            "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+            "dev": true,
+            "requires": {
+                "postcss": "^7.0.0"
+            }
+        },
+        "postcss-discard-duplicates": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+            "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+            "dev": true,
+            "requires": {
+                "postcss": "^7.0.0"
+            }
+        },
+        "postcss-discard-empty": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+            "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+            "dev": true,
+            "requires": {
+                "postcss": "^7.0.0"
+            }
+        },
+        "postcss-discard-overridden": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+            "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+            "dev": true,
+            "requires": {
+                "postcss": "^7.0.0"
+            }
+        },
+        "postcss-merge-longhand": {
+            "version": "4.0.11",
+            "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+            "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+            "dev": true,
+            "requires": {
+                "css-color-names": "0.0.4",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0",
+                "stylehacks": "^4.0.0"
+            }
+        },
+        "postcss-merge-rules": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+            "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.0.0",
+                "caniuse-api": "^3.0.0",
+                "cssnano-util-same-parent": "^4.0.0",
+                "postcss": "^7.0.0",
+                "postcss-selector-parser": "^3.0.0",
+                "vendors": "^1.0.0"
+            },
+            "dependencies": {
+                "postcss-selector-parser": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+                    "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+                    "dev": true,
+                    "requires": {
+                        "dot-prop": "^5.2.0",
+                        "indexes-of": "^1.0.1",
+                        "uniq": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "postcss-minify-font-values": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+            "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+            "dev": true,
+            "requires": {
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-minify-gradients": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+            "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+            "dev": true,
+            "requires": {
+                "cssnano-util-get-arguments": "^4.0.0",
+                "is-color-stop": "^1.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-minify-params": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+            "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+            "dev": true,
+            "requires": {
+                "alphanum-sort": "^1.0.0",
+                "browserslist": "^4.0.0",
+                "cssnano-util-get-arguments": "^4.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0",
+                "uniqs": "^2.0.0"
+            }
+        },
+        "postcss-minify-selectors": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+            "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+            "dev": true,
+            "requires": {
+                "alphanum-sort": "^1.0.0",
+                "has": "^1.0.0",
+                "postcss": "^7.0.0",
+                "postcss-selector-parser": "^3.0.0"
+            },
+            "dependencies": {
+                "postcss-selector-parser": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+                    "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+                    "dev": true,
+                    "requires": {
+                        "dot-prop": "^5.2.0",
+                        "indexes-of": "^1.0.1",
+                        "uniq": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "postcss-modules-extract-imports": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
+            "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
+            "dev": true,
+            "requires": {
+                "postcss": "^6.0.1"
+            },
+            "dependencies": {
+                "postcss": {
+                    "version": "6.0.23",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+                    "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^2.4.1",
+                        "source-map": "^0.6.1",
+                        "supports-color": "^5.4.0"
+                    }
+                }
+            }
+        },
+        "postcss-modules-local-by-default": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
+            "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
+            "dev": true,
+            "requires": {
+                "css-selector-tokenizer": "^0.7.0",
+                "postcss": "^6.0.1"
+            },
+            "dependencies": {
+                "postcss": {
+                    "version": "6.0.23",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+                    "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^2.4.1",
+                        "source-map": "^0.6.1",
+                        "supports-color": "^5.4.0"
+                    }
+                }
+            }
+        },
+        "postcss-modules-scope": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
+            "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
+            "dev": true,
+            "requires": {
+                "css-selector-tokenizer": "^0.7.0",
+                "postcss": "^6.0.1"
+            },
+            "dependencies": {
+                "postcss": {
+                    "version": "6.0.23",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+                    "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^2.4.1",
+                        "source-map": "^0.6.1",
+                        "supports-color": "^5.4.0"
+                    }
+                }
+            }
+        },
+        "postcss-modules-values": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
+            "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
+            "dev": true,
+            "requires": {
+                "icss-replace-symbols": "^1.1.0",
+                "postcss": "^6.0.1"
+            },
+            "dependencies": {
+                "postcss": {
+                    "version": "6.0.23",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+                    "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^2.4.1",
+                        "source-map": "^0.6.1",
+                        "supports-color": "^5.4.0"
+                    }
+                }
+            }
+        },
+        "postcss-normalize-charset": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+            "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+            "dev": true,
+            "requires": {
+                "postcss": "^7.0.0"
+            }
+        },
+        "postcss-normalize-display-values": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+            "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+            "dev": true,
+            "requires": {
+                "cssnano-util-get-match": "^4.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-normalize-positions": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+            "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+            "dev": true,
+            "requires": {
+                "cssnano-util-get-arguments": "^4.0.0",
+                "has": "^1.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-normalize-repeat-style": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+            "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+            "dev": true,
+            "requires": {
+                "cssnano-util-get-arguments": "^4.0.0",
+                "cssnano-util-get-match": "^4.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-normalize-string": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+            "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+            "dev": true,
+            "requires": {
+                "has": "^1.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-normalize-timing-functions": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+            "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+            "dev": true,
+            "requires": {
+                "cssnano-util-get-match": "^4.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-normalize-unicode": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+            "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-normalize-url": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+            "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+            "dev": true,
+            "requires": {
+                "is-absolute-url": "^2.0.0",
+                "normalize-url": "^3.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-normalize-whitespace": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+            "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+            "dev": true,
+            "requires": {
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-ordered-values": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+            "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+            "dev": true,
+            "requires": {
+                "cssnano-util-get-arguments": "^4.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-reduce-initial": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+            "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.0.0",
+                "caniuse-api": "^3.0.0",
+                "has": "^1.0.0",
+                "postcss": "^7.0.0"
+            }
+        },
+        "postcss-reduce-transforms": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+            "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+            "dev": true,
+            "requires": {
+                "cssnano-util-get-match": "^4.0.0",
+                "has": "^1.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0"
+            }
+        },
+        "postcss-selector-parser": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
+            "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
+            "dev": true,
+            "requires": {
+                "cssesc": "^3.0.0",
+                "indexes-of": "^1.0.1",
+                "uniq": "^1.0.1"
+            }
+        },
+        "postcss-svgo": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+            "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+            "dev": true,
+            "requires": {
+                "is-svg": "^3.0.0",
+                "postcss": "^7.0.0",
+                "postcss-value-parser": "^3.0.0",
+                "svgo": "^1.0.0"
+            }
+        },
+        "postcss-unique-selectors": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+            "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+            "dev": true,
+            "requires": {
+                "alphanum-sort": "^1.0.0",
+                "postcss": "^7.0.0",
+                "uniqs": "^2.0.0"
+            }
+        },
+        "postcss-value-parser": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+            "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+            "dev": true
+        },
+        "posthtml": {
+            "version": "0.11.6",
+            "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.11.6.tgz",
+            "integrity": "sha512-C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw==",
+            "dev": true,
+            "requires": {
+                "posthtml-parser": "^0.4.1",
+                "posthtml-render": "^1.1.5"
+            }
+        },
+        "posthtml-parser": {
+            "version": "0.4.2",
+            "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.4.2.tgz",
+            "integrity": "sha512-BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg==",
+            "dev": true,
+            "requires": {
+                "htmlparser2": "^3.9.2"
+            }
+        },
+        "posthtml-render": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.2.3.tgz",
+            "integrity": "sha512-rGGayND//VwTlsYKNqdILsA7U/XP0WJa6SMcdAEoqc2WRM5QExplGg/h9qbTuHz7mc2PvaXU+6iNxItvr5aHMg==",
+            "dev": true
+        },
+        "prelude-ls": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+            "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+            "dev": true
+        },
+        "process": {
+            "version": "0.11.10",
+            "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+            "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+            "dev": true
+        },
+        "process-nextick-args": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+            "dev": true
+        },
+        "psl": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+            "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+            "dev": true
+        },
+        "public-encrypt": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+            "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+            "dev": true,
+            "requires": {
+                "bn.js": "^4.1.0",
+                "browserify-rsa": "^4.0.0",
+                "create-hash": "^1.1.0",
+                "parse-asn1": "^5.0.0",
+                "randombytes": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            },
+            "dependencies": {
+                "bn.js": {
+                    "version": "4.11.9",
+                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+                    "dev": true
+                }
+            }
+        },
+        "punycode": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+            "dev": true
+        },
+        "purgecss": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-2.3.0.tgz",
+            "integrity": "sha512-BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ==",
+            "dev": true,
+            "requires": {
+                "commander": "^5.0.0",
+                "glob": "^7.0.0",
+                "postcss": "7.0.32",
+                "postcss-selector-parser": "^6.0.2"
+            },
+            "dependencies": {
+                "commander": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+                    "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+                    "dev": true
+                }
+            }
+        },
+        "q": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+            "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+            "dev": true
+        },
+        "qs": {
+            "version": "6.5.2",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+            "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+            "dev": true
+        },
+        "querystring": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+            "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+            "dev": true
+        },
+        "querystring-es3": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+            "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+            "dev": true
+        },
+        "quote-stream": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz",
+            "integrity": "sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=",
+            "dev": true,
+            "requires": {
+                "buffer-equal": "0.0.1",
+                "minimist": "^1.1.3",
+                "through2": "^2.0.0"
+            }
+        },
+        "randombytes": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "randomfill": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+            "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+            "dev": true,
+            "requires": {
+                "randombytes": "^2.0.5",
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "range-parser": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+            "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+            "dev": true
+        },
+        "read-pkg": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+            "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+            "dev": true,
+            "requires": {
+                "load-json-file": "^4.0.0",
+                "normalize-package-data": "^2.3.2",
+                "path-type": "^3.0.0"
+            }
+        },
+        "readable-stream": {
+            "version": "2.3.7",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+            "dev": true,
+            "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "readdirp": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+            "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+            "dev": true,
+            "requires": {
+                "graceful-fs": "^4.1.11",
+                "micromatch": "^3.1.10",
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "regenerate": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
+            "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
+            "dev": true
+        },
+        "regenerate-unicode-properties": {
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
+            "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+            "dev": true,
+            "requires": {
+                "regenerate": "^1.4.0"
+            }
+        },
+        "regenerator-runtime": {
+            "version": "0.13.7",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+            "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+            "dev": true
+        },
+        "regenerator-transform": {
+            "version": "0.14.5",
+            "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
+            "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+            "dev": true,
+            "requires": {
+                "@babel/runtime": "^7.8.4"
+            }
+        },
+        "regex-not": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+            "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+            "dev": true,
+            "requires": {
+                "extend-shallow": "^3.0.2",
+                "safe-regex": "^1.1.0"
+            }
+        },
+        "regexpu-core": {
+            "version": "4.7.0",
+            "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
+            "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
+            "dev": true,
+            "requires": {
+                "regenerate": "^1.4.0",
+                "regenerate-unicode-properties": "^8.2.0",
+                "regjsgen": "^0.5.1",
+                "regjsparser": "^0.6.4",
+                "unicode-match-property-ecmascript": "^1.0.4",
+                "unicode-match-property-value-ecmascript": "^1.2.0"
+            }
+        },
+        "regjsgen": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
+            "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
+            "dev": true
+        },
+        "regjsparser": {
+            "version": "0.6.4",
+            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
+            "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
+            "dev": true,
+            "requires": {
+                "jsesc": "~0.5.0"
+            },
+            "dependencies": {
+                "jsesc": {
+                    "version": "0.5.0",
+                    "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+                    "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+                    "dev": true
+                }
+            }
+        },
+        "remove-trailing-separator": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+            "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+            "dev": true
+        },
+        "repeat-element": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+            "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+            "dev": true
+        },
+        "repeat-string": {
+            "version": "1.6.1",
+            "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+            "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+            "dev": true
+        },
+        "request": {
+            "version": "2.88.2",
+            "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+            "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+            "dev": true,
+            "requires": {
+                "aws-sign2": "~0.7.0",
+                "aws4": "^1.8.0",
+                "caseless": "~0.12.0",
+                "combined-stream": "~1.0.6",
+                "extend": "~3.0.2",
+                "forever-agent": "~0.6.1",
+                "form-data": "~2.3.2",
+                "har-validator": "~5.1.3",
+                "http-signature": "~1.2.0",
+                "is-typedarray": "~1.0.0",
+                "isstream": "~0.1.2",
+                "json-stringify-safe": "~5.0.1",
+                "mime-types": "~2.1.19",
+                "oauth-sign": "~0.9.0",
+                "performance-now": "^2.1.0",
+                "qs": "~6.5.2",
+                "safe-buffer": "^5.1.2",
+                "tough-cookie": "~2.5.0",
+                "tunnel-agent": "^0.6.0",
+                "uuid": "^3.3.2"
+            }
+        },
+        "request-promise-core": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+            "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+            "dev": true,
+            "requires": {
+                "lodash": "^4.17.19"
+            }
+        },
+        "request-promise-native": {
+            "version": "1.0.9",
+            "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+            "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
+            "dev": true,
+            "requires": {
+                "request-promise-core": "1.1.4",
+                "stealthy-require": "^1.1.1",
+                "tough-cookie": "^2.3.3"
+            }
+        },
+        "resolve": {
+            "version": "1.17.0",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+            "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+            "dev": true,
+            "requires": {
+                "path-parse": "^1.0.6"
+            }
+        },
+        "resolve-from": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+            "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+            "dev": true
+        },
+        "resolve-url": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+            "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+            "dev": true
+        },
+        "restore-cursor": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+            "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+            "dev": true,
+            "requires": {
+                "onetime": "^2.0.0",
+                "signal-exit": "^3.0.2"
+            }
+        },
+        "ret": {
+            "version": "0.1.15",
+            "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+            "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+            "dev": true
+        },
+        "rgb-regex": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+            "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
+            "dev": true
+        },
+        "rgba-regex": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+            "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
+            "dev": true
+        },
+        "rimraf": {
+            "version": "2.7.1",
+            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+            "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+            "dev": true,
+            "requires": {
+                "glob": "^7.1.3"
+            }
+        },
+        "ripemd160": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+            "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+            "dev": true,
+            "requires": {
+                "hash-base": "^3.0.0",
+                "inherits": "^2.0.1"
+            }
+        },
+        "safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "dev": true
+        },
+        "safe-regex": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+            "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+            "dev": true,
+            "requires": {
+                "ret": "~0.1.10"
+            }
+        },
+        "safer-buffer": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "dev": true
+        },
+        "sass": {
+            "version": "1.26.10",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.10.tgz",
+            "integrity": "sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==",
+            "dev": true,
+            "requires": {
+                "chokidar": ">=2.0.0 <4.0.0"
+            }
+        },
+        "sax": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+            "dev": true
+        },
+        "saxes": {
+            "version": "3.1.11",
+            "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
+            "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
+            "dev": true,
+            "requires": {
+                "xmlchars": "^2.1.1"
+            }
+        },
+        "semver": {
+            "version": "5.7.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+            "dev": true
+        },
+        "send": {
+            "version": "0.17.1",
+            "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+            "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+            "dev": true,
+            "requires": {
+                "debug": "2.6.9",
+                "depd": "~1.1.2",
+                "destroy": "~1.0.4",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "fresh": "0.5.2",
+                "http-errors": "~1.7.2",
+                "mime": "1.6.0",
+                "ms": "2.1.1",
+                "on-finished": "~2.3.0",
+                "range-parser": "~1.2.1",
+                "statuses": "~1.5.0"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    },
+                    "dependencies": {
+                        "ms": {
+                            "version": "2.0.0",
+                            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                            "dev": true
+                        }
+                    }
+                },
+                "ms": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+                    "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+                    "dev": true
+                }
+            }
+        },
+        "serialize-to-js": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/serialize-to-js/-/serialize-to-js-3.1.1.tgz",
+            "integrity": "sha512-F+NGU0UHMBO4Q965tjw7rvieNVjlH6Lqi2emq/Lc9LUURYJbiCzmpi4Cy1OOjjVPtxu0c+NE85LU6968Wko5ZA==",
+            "dev": true
+        },
+        "serve-static": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+            "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+            "dev": true,
+            "requires": {
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "parseurl": "~1.3.3",
+                "send": "0.17.1"
+            }
+        },
+        "set-value": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+            "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+            "dev": true,
+            "requires": {
+                "extend-shallow": "^2.0.1",
+                "is-extendable": "^0.1.1",
+                "is-plain-object": "^2.0.3",
+                "split-string": "^3.0.1"
+            },
+            "dependencies": {
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "setimmediate": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+            "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+            "dev": true
+        },
+        "setprototypeof": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+            "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+            "dev": true
+        },
+        "sha.js": {
+            "version": "2.4.11",
+            "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+            "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+            "dev": true,
+            "requires": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "shallow-copy": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
+            "integrity": "sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=",
+            "dev": true
+        },
+        "shebang-command": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+            "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+            "dev": true,
+            "requires": {
+                "shebang-regex": "^1.0.0"
+            }
+        },
+        "shebang-regex": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+            "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+            "dev": true
+        },
+        "shell-quote": {
+            "version": "1.7.2",
+            "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
+            "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+            "dev": true
+        },
+        "signal-exit": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+            "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+            "dev": true
+        },
+        "simple-swizzle": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+            "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+            "dev": true,
+            "requires": {
+                "is-arrayish": "^0.3.1"
+            },
+            "dependencies": {
+                "is-arrayish": {
+                    "version": "0.3.2",
+                    "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+                    "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+                    "dev": true
+                }
+            }
+        },
+        "snapdragon": {
+            "version": "0.8.2",
+            "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+            "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+            "dev": true,
+            "requires": {
+                "base": "^0.11.1",
+                "debug": "^2.2.0",
+                "define-property": "^0.2.5",
+                "extend-shallow": "^2.0.1",
+                "map-cache": "^0.2.2",
+                "source-map": "^0.5.6",
+                "source-map-resolve": "^0.5.0",
+                "use": "^3.1.0"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                },
+                "extend-shallow": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+                    "dev": true,
+                    "requires": {
+                        "is-extendable": "^0.1.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                    "dev": true
+                },
+                "source-map": {
+                    "version": "0.5.7",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+                    "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+                    "dev": true
+                }
+            }
+        },
+        "snapdragon-node": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+            "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+            "dev": true,
+            "requires": {
+                "define-property": "^1.0.0",
+                "isobject": "^3.0.0",
+                "snapdragon-util": "^3.0.1"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+                    "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^1.0.0"
+                    }
+                },
+                "is-accessor-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-data-descriptor": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                    "dev": true,
+                    "requires": {
+                        "kind-of": "^6.0.0"
+                    }
+                },
+                "is-descriptor": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                    "dev": true,
+                    "requires": {
+                        "is-accessor-descriptor": "^1.0.0",
+                        "is-data-descriptor": "^1.0.0",
+                        "kind-of": "^6.0.2"
+                    }
+                }
+            }
+        },
+        "snapdragon-util": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+            "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+            "dev": true,
+            "requires": {
+                "kind-of": "^3.2.0"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "source-map": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "dev": true
+        },
+        "source-map-resolve": {
+            "version": "0.5.3",
+            "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+            "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+            "dev": true,
+            "requires": {
+                "atob": "^2.1.2",
+                "decode-uri-component": "^0.2.0",
+                "resolve-url": "^0.2.1",
+                "source-map-url": "^0.4.0",
+                "urix": "^0.1.0"
+            }
+        },
+        "source-map-support": {
+            "version": "0.5.19",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+            "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+            "dev": true,
+            "requires": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "source-map-url": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+            "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+            "dev": true
+        },
+        "spdx-correct": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+            "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+            "dev": true,
+            "requires": {
+                "spdx-expression-parse": "^3.0.0",
+                "spdx-license-ids": "^3.0.0"
+            }
+        },
+        "spdx-exceptions": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+            "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+            "dev": true
+        },
+        "spdx-expression-parse": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+            "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+            "dev": true,
+            "requires": {
+                "spdx-exceptions": "^2.1.0",
+                "spdx-license-ids": "^3.0.0"
+            }
+        },
+        "spdx-license-ids": {
+            "version": "3.0.5",
+            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+            "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+            "dev": true
+        },
+        "split-string": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+            "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+            "dev": true,
+            "requires": {
+                "extend-shallow": "^3.0.0"
+            }
+        },
+        "sprintf-js": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+            "dev": true
+        },
+        "sshpk": {
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+            "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+            "dev": true,
+            "requires": {
+                "asn1": "~0.2.3",
+                "assert-plus": "^1.0.0",
+                "bcrypt-pbkdf": "^1.0.0",
+                "dashdash": "^1.12.0",
+                "ecc-jsbn": "~0.1.1",
+                "getpass": "^0.1.1",
+                "jsbn": "~0.1.0",
+                "safer-buffer": "^2.0.2",
+                "tweetnacl": "~0.14.0"
+            }
+        },
+        "stable": {
+            "version": "0.1.8",
+            "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+            "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+            "dev": true
+        },
+        "static-eval": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.1.0.tgz",
+            "integrity": "sha512-agtxZ/kWSsCkI5E4QifRwsaPs0P0JmZV6dkLz6ILYfFYQGn+5plctanRN+IC8dJRiFkyXHrwEE3W9Wmx67uDbw==",
+            "dev": true,
+            "requires": {
+                "escodegen": "^1.11.1"
+            },
+            "dependencies": {
+                "escodegen": {
+                    "version": "1.14.3",
+                    "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+                    "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+                    "dev": true,
+                    "requires": {
+                        "esprima": "^4.0.1",
+                        "estraverse": "^4.2.0",
+                        "esutils": "^2.0.2",
+                        "optionator": "^0.8.1",
+                        "source-map": "~0.6.1"
+                    }
+                },
+                "esprima": {
+                    "version": "4.0.1",
+                    "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+                    "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+                    "dev": true
+                }
+            }
+        },
+        "static-extend": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+            "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+            "dev": true,
+            "requires": {
+                "define-property": "^0.2.5",
+                "object-copy": "^0.1.0"
+            },
+            "dependencies": {
+                "define-property": {
+                    "version": "0.2.5",
+                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+                    "dev": true,
+                    "requires": {
+                        "is-descriptor": "^0.1.0"
+                    }
+                }
+            }
+        },
+        "static-module": {
+            "version": "2.2.5",
+            "resolved": "https://registry.npmjs.org/static-module/-/static-module-2.2.5.tgz",
+            "integrity": "sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==",
+            "dev": true,
+            "requires": {
+                "concat-stream": "~1.6.0",
+                "convert-source-map": "^1.5.1",
+                "duplexer2": "~0.1.4",
+                "escodegen": "~1.9.0",
+                "falafel": "^2.1.0",
+                "has": "^1.0.1",
+                "magic-string": "^0.22.4",
+                "merge-source-map": "1.0.4",
+                "object-inspect": "~1.4.0",
+                "quote-stream": "~1.0.2",
+                "readable-stream": "~2.3.3",
+                "shallow-copy": "~0.0.1",
+                "static-eval": "^2.0.0",
+                "through2": "~2.0.3"
+            },
+            "dependencies": {
+                "object-inspect": {
+                    "version": "1.4.1",
+                    "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz",
+                    "integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==",
+                    "dev": true
+                }
+            }
+        },
+        "statuses": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+            "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+            "dev": true
+        },
+        "stealthy-require": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+            "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+            "dev": true
+        },
+        "stream-browserify": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+            "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+            "dev": true,
+            "requires": {
+                "inherits": "~2.0.1",
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "stream-http": {
+            "version": "2.8.3",
+            "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+            "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+            "dev": true,
+            "requires": {
+                "builtin-status-codes": "^3.0.0",
+                "inherits": "^2.0.1",
+                "readable-stream": "^2.3.6",
+                "to-arraybuffer": "^1.0.0",
+                "xtend": "^4.0.0"
+            }
+        },
+        "string.prototype.padend": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz",
+            "integrity": "sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.0-next.1"
+            }
+        },
+        "string.prototype.trimend": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+            "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.5"
+            }
+        },
+        "string.prototype.trimstart": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+            "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.5"
+            }
+        },
+        "string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "strip-ansi": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+            "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+            "dev": true,
+            "requires": {
+                "ansi-regex": "^3.0.0"
+            }
+        },
+        "strip-bom": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+            "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+            "dev": true
+        },
+        "stylehacks": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+            "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.0.0",
+                "postcss": "^7.0.0",
+                "postcss-selector-parser": "^3.0.0"
+            },
+            "dependencies": {
+                "postcss-selector-parser": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+                    "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+                    "dev": true,
+                    "requires": {
+                        "dot-prop": "^5.2.0",
+                        "indexes-of": "^1.0.1",
+                        "uniq": "^1.0.1"
+                    }
+                }
+            }
+        },
+        "supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dev": true,
+            "requires": {
+                "has-flag": "^3.0.0"
+            }
+        },
+        "svgo": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+            "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+            "dev": true,
+            "requires": {
+                "chalk": "^2.4.1",
+                "coa": "^2.0.2",
+                "css-select": "^2.0.0",
+                "css-select-base-adapter": "^0.1.1",
+                "css-tree": "1.0.0-alpha.37",
+                "csso": "^4.0.2",
+                "js-yaml": "^3.13.1",
+                "mkdirp": "~0.5.1",
+                "object.values": "^1.1.0",
+                "sax": "~1.2.4",
+                "stable": "^0.1.8",
+                "unquote": "~1.1.1",
+                "util.promisify": "~1.0.0"
+            }
+        },
+        "symbol-tree": {
+            "version": "3.2.4",
+            "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+            "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+            "dev": true
+        },
+        "terser": {
+            "version": "3.17.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+            "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
+            "dev": true,
+            "requires": {
+                "commander": "^2.19.0",
+                "source-map": "~0.6.1",
+                "source-map-support": "~0.5.10"
+            }
+        },
+        "through2": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+            "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+            "dev": true,
+            "requires": {
+                "readable-stream": "~2.3.6",
+                "xtend": "~4.0.1"
+            }
+        },
+        "timers-browserify": {
+            "version": "2.0.11",
+            "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+            "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+            "dev": true,
+            "requires": {
+                "setimmediate": "^1.0.4"
+            }
+        },
+        "timsort": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+            "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+            "dev": true
+        },
+        "tiny-inflate": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
+            "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
+            "dev": true
+        },
+        "to-arraybuffer": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+            "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+            "dev": true
+        },
+        "to-fast-properties": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+            "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+            "dev": true
+        },
+        "to-object-path": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+            "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+            "dev": true,
+            "requires": {
+                "kind-of": "^3.0.2"
+            },
+            "dependencies": {
+                "kind-of": {
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                    "dev": true,
+                    "requires": {
+                        "is-buffer": "^1.1.5"
+                    }
+                }
+            }
+        },
+        "to-regex": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+            "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+            "dev": true,
+            "requires": {
+                "define-property": "^2.0.2",
+                "extend-shallow": "^3.0.2",
+                "regex-not": "^1.0.2",
+                "safe-regex": "^1.1.0"
+            }
+        },
+        "to-regex-range": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+            "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+            "dev": true,
+            "requires": {
+                "is-number": "^3.0.0",
+                "repeat-string": "^1.6.1"
+            }
+        },
+        "toidentifier": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+            "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+            "dev": true
+        },
+        "tough-cookie": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+            "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+            "dev": true,
+            "requires": {
+                "psl": "^1.1.28",
+                "punycode": "^2.1.1"
+            }
+        },
+        "tr46": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+            "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+            "dev": true,
+            "requires": {
+                "punycode": "^2.1.0"
+            }
+        },
+        "tty-browserify": {
+            "version": "0.0.0",
+            "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+            "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+            "dev": true
+        },
+        "tunnel-agent": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+            "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "tweetnacl": {
+            "version": "0.14.5",
+            "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+            "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+            "dev": true
+        },
+        "type-check": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+            "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+            "dev": true,
+            "requires": {
+                "prelude-ls": "~1.1.2"
+            }
+        },
+        "typedarray": {
+            "version": "0.0.6",
+            "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+            "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+            "dev": true
+        },
+        "typescript": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz",
+            "integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==",
+            "dev": true
+        },
+        "uncss": {
+            "version": "0.17.3",
+            "resolved": "https://registry.npmjs.org/uncss/-/uncss-0.17.3.tgz",
+            "integrity": "sha512-ksdDWl81YWvF/X14fOSw4iu8tESDHFIeyKIeDrK6GEVTQvqJc1WlOEXqostNwOCi3qAj++4EaLsdAgPmUbEyog==",
+            "dev": true,
+            "requires": {
+                "commander": "^2.20.0",
+                "glob": "^7.1.4",
+                "is-absolute-url": "^3.0.1",
+                "is-html": "^1.1.0",
+                "jsdom": "^14.1.0",
+                "lodash": "^4.17.15",
+                "postcss": "^7.0.17",
+                "postcss-selector-parser": "6.0.2",
+                "request": "^2.88.0"
+            },
+            "dependencies": {
+                "is-absolute-url": {
+                    "version": "3.0.3",
+                    "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+                    "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+                    "dev": true
+                }
+            }
+        },
+        "unicode-canonical-property-names-ecmascript": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+            "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+            "dev": true
+        },
+        "unicode-match-property-ecmascript": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+            "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+            "dev": true,
+            "requires": {
+                "unicode-canonical-property-names-ecmascript": "^1.0.4",
+                "unicode-property-aliases-ecmascript": "^1.0.4"
+            }
+        },
+        "unicode-match-property-value-ecmascript": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
+            "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
+            "dev": true
+        },
+        "unicode-property-aliases-ecmascript": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
+            "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
+            "dev": true
+        },
+        "unicode-trie": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-0.3.1.tgz",
+            "integrity": "sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=",
+            "dev": true,
+            "requires": {
+                "pako": "^0.2.5",
+                "tiny-inflate": "^1.0.0"
+            }
+        },
+        "union-value": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+            "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+            "dev": true,
+            "requires": {
+                "arr-union": "^3.1.0",
+                "get-value": "^2.0.6",
+                "is-extendable": "^0.1.1",
+                "set-value": "^2.0.1"
+            }
+        },
+        "uniq": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+            "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+            "dev": true
+        },
+        "uniqs": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+            "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+            "dev": true
+        },
+        "unquote": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+            "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
+            "dev": true
+        },
+        "unset-value": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+            "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+            "dev": true,
+            "requires": {
+                "has-value": "^0.3.1",
+                "isobject": "^3.0.0"
+            },
+            "dependencies": {
+                "has-value": {
+                    "version": "0.3.1",
+                    "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+                    "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+                    "dev": true,
+                    "requires": {
+                        "get-value": "^2.0.3",
+                        "has-values": "^0.1.4",
+                        "isobject": "^2.0.0"
+                    },
+                    "dependencies": {
+                        "isobject": {
+                            "version": "2.1.0",
+                            "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+                            "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+                            "dev": true,
+                            "requires": {
+                                "isarray": "1.0.0"
+                            }
+                        }
+                    }
+                },
+                "has-values": {
+                    "version": "0.1.4",
+                    "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+                    "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+                    "dev": true
+                }
+            }
+        },
+        "upath": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+            "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+            "dev": true
+        },
+        "uri-js": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+            "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
+            "dev": true,
+            "requires": {
+                "punycode": "^2.1.0"
+            }
+        },
+        "urix": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+            "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+            "dev": true
+        },
+        "url": {
+            "version": "0.11.0",
+            "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+            "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+            "dev": true,
+            "requires": {
+                "punycode": "1.3.2",
+                "querystring": "0.2.0"
+            },
+            "dependencies": {
+                "punycode": {
+                    "version": "1.3.2",
+                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+                    "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+                    "dev": true
+                }
+            }
+        },
+        "use": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+            "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+            "dev": true
+        },
+        "util": {
+            "version": "0.11.1",
+            "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+            "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+            "dev": true,
+            "requires": {
+                "inherits": "2.0.3"
+            },
+            "dependencies": {
+                "inherits": {
+                    "version": "2.0.3",
+                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                    "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                    "dev": true
+                }
+            }
+        },
+        "util-deprecate": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+            "dev": true
+        },
+        "util.promisify": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+            "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.2",
+                "has-symbols": "^1.0.1",
+                "object.getownpropertydescriptors": "^2.1.0"
+            }
+        },
+        "uuid": {
+            "version": "3.4.0",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+            "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+            "dev": true
+        },
+        "v8-compile-cache": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
+            "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
+            "dev": true
+        },
+        "validate-npm-package-license": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+            "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+            "dev": true,
+            "requires": {
+                "spdx-correct": "^3.0.0",
+                "spdx-expression-parse": "^3.0.0"
+            }
+        },
+        "vendors": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
+            "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
+            "dev": true
+        },
+        "verror": {
+            "version": "1.10.0",
+            "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+            "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+            "dev": true,
+            "requires": {
+                "assert-plus": "^1.0.0",
+                "core-util-is": "1.0.2",
+                "extsprintf": "^1.2.0"
+            }
+        },
+        "vlq": {
+            "version": "0.2.3",
+            "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
+            "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+            "dev": true
+        },
+        "vm-browserify": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+            "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+            "dev": true
+        },
+        "w3c-hr-time": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+            "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+            "dev": true,
+            "requires": {
+                "browser-process-hrtime": "^1.0.0"
+            }
+        },
+        "w3c-xmlserializer": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
+            "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+            "dev": true,
+            "requires": {
+                "domexception": "^1.0.1",
+                "webidl-conversions": "^4.0.2",
+                "xml-name-validator": "^3.0.0"
+            }
+        },
+        "wcwidth": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+            "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+            "dev": true,
+            "requires": {
+                "defaults": "^1.0.3"
+            }
+        },
+        "webidl-conversions": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+            "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+            "dev": true
+        },
+        "whatwg-encoding": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+            "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+            "dev": true,
+            "requires": {
+                "iconv-lite": "0.4.24"
+            }
+        },
+        "whatwg-mimetype": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+            "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+            "dev": true
+        },
+        "whatwg-url": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
+            "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
+            "dev": true,
+            "requires": {
+                "lodash.sortby": "^4.7.0",
+                "tr46": "^1.0.1",
+                "webidl-conversions": "^4.0.2"
+            }
+        },
+        "which": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+            "dev": true,
+            "requires": {
+                "isexe": "^2.0.0"
+            }
+        },
+        "word-wrap": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+            "dev": true
+        },
+        "wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+            "dev": true
+        },
+        "ws": {
+            "version": "5.2.2",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+            "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+            "dev": true,
+            "requires": {
+                "async-limiter": "~1.0.0"
+            }
+        },
+        "xml-name-validator": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+            "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+            "dev": true
+        },
+        "xmlchars": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+            "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+            "dev": true
+        },
+        "xtend": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+            "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+            "dev": true
+        }
+    }
+}
diff --git a/ccm-core/package.json b/ccm-core/package.json
new file mode 100644
index 000000000..4f5daf16a
--- /dev/null
+++ b/ccm-core/package.json
@@ -0,0 +1,24 @@
+{
+    "name": "ccm-core",
+    "version": "7.0.0",
+    "description": "JavaScript stuff for ccm-core",
+    "main": "index.js",
+    "scripts": {
+        "build": "npm-run-all build:*:*",
+        "build:ccm-admin:js": "parcel build --out-dir target/generated-resources/assets/@admin src/main/typescript/ccm-admin/ccm-admin.ts",
+        "build:ccm-admin:css": "sass src/main/scss/ccm-admin/ccm-admin.scss target/generated-resources/assets/@admin/ccm-admin.css"
+    },
+    "author": "Jens Pelzetter",
+    "license": "LGPL-3.0-or-later",
+    "devDependencies": {
+        "npm-run-all": "^4.1.5",
+        "parcel-bundler": "^1.12.4",
+        "sass": "^1.26.10",
+        "typescript": "^4.0.2"
+    },
+    "dependencies": {
+        "bootstrap": "^4.5.2",
+        "jquery": "^3.5.1",
+        "popper.js": "^1.16.1"
+    }
+}
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 1c5e2aae8..833befc35 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -8,26 +9,26 @@
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'Z</maven.build.timestamp.format>
     </properties>
-    
+
     <parent>
         <groupId>org.libreccm</groupId>
         <artifactId>libreccm-parent</artifactId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.libreccm</groupId>
     <artifactId>ccm-core</artifactId>
     <!--<version>7.0.0-SNAPSHOT</version>-->
-    
+
     <name>LibreCCM Core</name>
-    
+
     <licenses>
         <license>
             <name>Lesser GPL 2.1</name>
             <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1</url>
         </license>
     </licenses>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
@@ -59,13 +60,13 @@
             <artifactId>hibernate-core</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
@@ -84,13 +85,13 @@
             <groupId>org.glassfish</groupId>
             <artifactId>javax.el</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-search-orm</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -101,7 +102,7 @@
             <artifactId>jaxb-runtime</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>javax.mvc</groupId>
             <artifactId>javax.mvc-api</artifactId>
@@ -111,12 +112,12 @@
             <artifactId>krazo-core</artifactId>
             <scope>provided</scope>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>org.eclipse.krazo.ext</groupId>
             <artifactId>krazo-freemarker</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <!--
             Flyway framework for database schema migrations
         -->
@@ -124,7 +125,7 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
         </dependency>
-        
+
         <!-- Dependencies for log4j 2 -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -134,7 +135,7 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
@@ -151,7 +152,7 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>oro</groupId>
             <artifactId>oro</artifactId>
@@ -160,18 +161,18 @@
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk16</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>net.sf.jtidy</groupId>
             <artifactId>jtidy</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -182,20 +183,20 @@
             <artifactId>hamcrest-library</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.libreccm</groupId>
             <artifactId>ccm-testutils</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.jboss.arquillian.junit</groupId>
             <artifactId>arquillian-junit-container</artifactId>
@@ -211,12 +212,12 @@
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
@@ -225,7 +226,7 @@
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-web</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-api</artifactId>
@@ -238,33 +239,33 @@
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-jackson</artifactId>
         </dependency>
-                
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
         </dependency>
-        
+
         <!--<dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.json</artifactId>
         </dependency>-->
-        
+
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>net.sf.saxon</groupId>
             <artifactId>Saxon-HE</artifactId>
         </dependency>
-        
+
         <!-- Export Import Libraries -->
 
         <dependency>
@@ -283,17 +284,17 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jdk8</artifactId>
         </dependency>
-        <dependency> <!-- for xml ex-/import -->
+        <dependency>            <!-- for xml ex-/import -->
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
         </dependency>
-        <dependency> <!-- for csv ex-/import -->
+        <dependency>            <!-- for csv ex-/import -->
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <finalName>ccm-core</finalName>
         <!--<resources>
@@ -301,14 +302,17 @@
                 <directory>${project.build.directory}/generated-resources</directory>
             </resource>
         </resources>-->
-        
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
+            <resource>
+                <directory>./target/generated-resources</directory>
+            </resource>
         </resources>
-        
+
         <testResources>
             <testResource>
                 <directory>src/test/resources</directory>
@@ -317,7 +321,7 @@
                 <directory>${project.build.directory}/generated-resources</directory>
             </testResource>
         </testResources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -330,6 +334,39 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <configuration>
+                    <installDirectory>../node</installDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>Install node.js and NPM</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <configuration>
+                            <nodeVersion>v12.18.3</nodeVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>build</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>run build</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -394,7 +431,7 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <reporting>
         <plugins>
             <plugin>
@@ -443,7 +480,7 @@
                     <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
@@ -585,7 +622,7 @@
             </plugin>
         </plugins>
     </reporting>
-    
+
     <profiles>
         <!-- 
             TomEE are temporaly disabled, TomEE support is scheduled for 
@@ -781,7 +818,7 @@
                 </plugins>
             </build>
         </profile>-->
-     
+
         <profile>
             <id>run-its-with-wildfly-h2mem</id>
             <dependencies>
@@ -795,7 +832,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -808,7 +845,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
                 </testResources>
-            
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -906,7 +943,7 @@
                     </plugin>
                 </plugins>
             </build>
-            
+
             <reporting>
                 <plugins>
                     <plugin>
@@ -924,7 +961,7 @@
                 </plugins>
             </reporting>
         </profile>
-        
+
         <profile>
             <id>run-its-with-wildfly-pgsql</id>
             <dependencies>
@@ -943,7 +980,7 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-                
+
             <build>
                 <testResources>
                     <testResource>
@@ -956,7 +993,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -1085,7 +1122,7 @@
                     </plugin>
                 </plugins>
             </build>
-            
+
             <reporting>
                 <plugins>
                     <plugin>
@@ -1103,7 +1140,7 @@
                 </plugins>
             </reporting>
         </profile>
-                
+
         <profile>
             <id>run-its-in-remote-wildfly-h2mem</id>
             <dependencies>
@@ -1117,7 +1154,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -1130,7 +1167,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -1178,7 +1215,7 @@
                     </plugin>
                 </plugins>
             </build>
-            
+
             <reporting>
                 <plugins>
                     <plugin>
@@ -1196,7 +1233,7 @@
                 </plugins>
             </reporting>
         </profile>
-        
+
         <profile>
             <id>run-its-in-remote-wildfly-pgsql</id>
             <dependencies>
@@ -1210,7 +1247,7 @@
                     <artifactId>Saxon-HE</artifactId>
                 </dependency>
             </dependencies>
-            
+
             <build>
                 <testResources>
                     <testResource>
@@ -1223,7 +1260,7 @@
                         <directory>${project.build.directory}/generated-resources</directory>
                     </testResource>
                 </testResources>
-                
+
                 <plugins>
                     <plugin>
                         <groupId>de.jpdigital</groupId>
@@ -1271,7 +1308,7 @@
                     </plugin>
                 </plugins>
             </build>
-            
+
             <reporting>
                 <plugins>
                     <plugin>
@@ -1289,7 +1326,7 @@
                 </plugins>
             </reporting>
         </profile>
-        
+
     </profiles>
-    
+
 </project>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
index b13f9f854..5de79a01c 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
@@ -4,6 +4,8 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html">
     <h:head>
         <title>System Information</title>
+        <link href="#{request.contextPath}/assets/@admin/ccm-admin.css" 
+              rel="stylesheet"/>
     </h:head>
     <h:body>
         <h1>System Information</h1>
@@ -11,11 +13,12 @@
         <dl>
             <c:forEach items="#{SystemInformationModel.ccmSystemInformation}" 
                        var="prop">
-            <div>
-            <dt>#{prop.key}</dt>
-            <dd>#{prop.value}</dd>
-            </div>
+                <div>
+                    <dt>#{prop.key}</dt>
+                    <dd>#{prop.value}</dd>
+                </div>
             </c:forEach>
         </dl>
+        <script src="#{request.contextPath}/assets/@admin/ccm-admin.js"></script>
     </h:body>
 </html>
diff --git a/ccm-core/src/main/scss/ccm-admin/ccm-admin.scss b/ccm-core/src/main/scss/ccm-admin/ccm-admin.scss
new file mode 100644
index 000000000..a35964e3e
--- /dev/null
+++ b/ccm-core/src/main/scss/ccm-admin/ccm-admin.scss
@@ -0,0 +1 @@
+@import "../../../../node_modules/bootstrap/scss/bootstrap";
\ No newline at end of file
diff --git a/ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts b/ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts
new file mode 100644
index 000000000..6fcacc09f
--- /dev/null
+++ b/ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts
@@ -0,0 +1 @@
+import "bootstrap";
\ No newline at end of file

From ee1bc074252468bd4def20303b19b65b061d4f1d Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 19 Sep 2020 17:41:00 +0200
Subject: [PATCH 03/93] Filter for JAX-RS / EE MVC applications for redirecting
 unauthenticated users to the login application

---
 .../libreccm/ui/IsAuthenticatedFilter.java    | 69 +++++++++++++++++++
 .../libreccm/ui/admin/AdminApplication.java   | 21 ++++--
 .../SystemInformationController.java          |  6 ++
 3 files changed, 90 insertions(+), 6 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/IsAuthenticatedFilter.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/IsAuthenticatedFilter.java b/ccm-core/src/main/java/org/libreccm/ui/IsAuthenticatedFilter.java
new file mode 100644
index 000000000..037a26ed8
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/IsAuthenticatedFilter.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui;
+
+import org.libreccm.security.Shiro;
+
+import java.io.IOException;
+import java.net.URI;
+
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.core.Response;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@PreMatching
+public class IsAuthenticatedFilter implements ContainerRequestFilter {
+
+    @Inject
+    private ServletContext servletContext;
+
+    @Inject
+    private Shiro shiro;
+
+    @Override
+    public void filter(final ContainerRequestContext requestContext)
+        throws IOException {
+        if (!shiro.getSubject().isAuthenticated()) {
+            final String contextPath = servletContext.getContextPath();
+            final String returnUrl = requestContext
+                .getUriInfo()
+                .getRequestUri()
+                .getPath();
+            requestContext.abortWith(
+                Response.temporaryRedirect(
+                    URI.create(
+                        String.format(
+                            "/%s/ccm/register?return_url=%s",
+                            contextPath,
+                            returnUrl
+                        )
+                    )
+                ).build()
+            );
+        }
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
index d9dcc457e..c8bc90169 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
@@ -18,8 +18,9 @@
  */
 package org.libreccm.ui.admin;
 
+import org.libreccm.ui.IsAuthenticatedFilter;
 
-
+import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -40,11 +41,19 @@ public class AdminApplication extends Application {
 
     @Override
     public Set<Class<?>> getClasses() {
-        return adminPages
-            .stream()
-            .map(AdminPage::getControllerClasses)
-            .flatMap(controllers -> controllers.stream())
-            .collect(Collectors.toSet());
+        final Set<Class<?>> classes = new HashSet<>();
+
+        classes.add(IsAuthenticatedFilter.class);
+        
+        classes.addAll(
+            adminPages
+                .stream()
+                .map(AdminPage::getControllerClasses)
+                .flatMap(controllers -> controllers.stream())
+                .collect(Collectors.toSet())
+        );
+
+        return classes;
 
 //        final Set<Class<?>> classes = new HashSet<>();
 //        classes.add(SystemInformationController.class);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
index 98fd2acd6..bbc38465e 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
@@ -18,6 +18,10 @@
  */
 package org.libreccm.ui.admin.systeminformation;
 
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
 import javax.enterprise.context.RequestScoped;
 import javax.mvc.Controller;
 import javax.ws.rs.GET;
@@ -34,6 +38,8 @@ public class SystemInformationController {
     
     @GET
     @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String getSystemInformation() {
         return "org/libreccm/ui/admin/systeminformation.xhtml";
     }

From 26b7b31d940d79459aecdbfc961e1fe8ebad169f Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 20 Sep 2020 13:18:59 +0200
Subject: [PATCH 04/93] Base template for ccm-admin

---
 ccm-core/package-lock.json                    |  5 ++
 ccm-core/package.json                         |  1 +
 .../java/org/libreccm/ui/admin/AdminPage.java | 22 ++++-
 .../org/libreccm/ui/admin/AdminPageModel.java | 67 ++++++++++++++++
 .../libreccm/ui/admin/AdminPagesModel.java    | 80 +++++++++++++++++++
 .../SystemInformationModel.java               |  2 -
 .../SystemInformationPage.java                | 10 +++
 .../org/libreccm/ui/admin/ccm-admin.xhtml     | 64 +++++++++++++++
 .../libreccm/ui/admin/systeminformation.xhtml | 40 +++++-----
 .../assets/bootstrap/bootstrap-icons.svg      |  1 +
 ccm-core/src/main/scss/ccm-admin/_custom.scss | 60 ++++++++++++++
 .../src/main/scss/ccm-admin/ccm-admin.scss    |  1 +
 12 files changed, 329 insertions(+), 24 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
 create mode 100644 ccm-core/src/main/resources/assets/bootstrap/bootstrap-icons.svg
 create mode 100644 ccm-core/src/main/scss/ccm-admin/_custom.scss

diff --git a/ccm-core/package-lock.json b/ccm-core/package-lock.json
index 6106947ac..140618336 100644
--- a/ccm-core/package-lock.json
+++ b/ccm-core/package-lock.json
@@ -1571,6 +1571,11 @@
             "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.2.tgz",
             "integrity": "sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A=="
         },
+        "bootstrap-icons": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.0.0.tgz",
+            "integrity": "sha512-PaQm3VtSqbUnWuyqGmFJG5iF9UMieDuk8raPOmKOtKeyWyiVshgLoKa+9EWGolGU/nvyBLEBWhZoQqhu9ccNBg=="
+        },
         "brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
diff --git a/ccm-core/package.json b/ccm-core/package.json
index 4f5daf16a..7f8459185 100644
--- a/ccm-core/package.json
+++ b/ccm-core/package.json
@@ -18,6 +18,7 @@
     },
     "dependencies": {
         "bootstrap": "^4.5.2",
+        "bootstrap-icons": "^1.0.0",
         "jquery": "^3.5.1",
         "popper.js": "^1.16.1"
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
index 3aba8dbd8..27e1ab4b4 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
@@ -18,6 +18,7 @@
  */
 package org.libreccm.ui.admin;
 
+import java.util.ResourceBundle;
 import java.util.Set;
 
 /**
@@ -33,6 +34,16 @@ public interface AdminPage {
      */
     Set<Class<?>> getControllerClasses();
 
+    /**
+     * The entry point for the admin module. Used to generate the URL for an
+     * admin page in the navigation etc. For example, with the return value will
+     * {@code systeminformation} the generated link is
+     * {@code #{contextPath}/@admin/#{path}}.
+     *
+     * @return The path fragment of the entry point of the admin page/module.
+     */
+    String getPath();
+
     /**
      * Gets the resourcebundle which provides the label of the admin page.
      *
@@ -63,8 +74,15 @@ public interface AdminPage {
     String getDescriptionKey();
 
     /**
-     * Gets the position of the page in the admin nav bar. 
-     * 
+     * Name of icon to use.
+     *
+     * @return The icon to use for the page.
+     */
+    String getIcon();
+
+    /**
+     * Gets the position of the page in the admin nav bar.
+     *
      * @return The position of the page in the admin navigation.
      */
     int getPosition();
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
new file mode 100644
index 000000000..706fa3342
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class AdminPageModel {
+
+    private String path;
+
+    private String label;
+
+    private String description;
+
+    private String icon;
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
new file mode 100644
index 000000000..0335d7b32
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin;
+
+import org.libreccm.l10n.GlobalizationHelper;
+
+import java.util.List;
+import java.util.ResourceBundle;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("AdminPagesModel")
+public class AdminPagesModel {
+
+    @Inject
+    private Instance<AdminPage> adminPages;
+
+    @Inject
+    private GlobalizationHelper globalizationHelper;
+
+    public List<AdminPageModel> getAdminPages() {
+        return adminPages
+            .stream()
+            .sorted(
+                (page1, page2) -> Integer.compare(
+                    page1.getPosition(), page2.getPosition()
+                )
+            )
+            .map(this::buildAdminPageModel)
+            .collect(Collectors.toList());
+    }
+
+    private AdminPageModel buildAdminPageModel(final AdminPage fromAdminPage) {
+        final ResourceBundle labelBundle = ResourceBundle.getBundle(
+            fromAdminPage.getLabelBundle(),
+            globalizationHelper.getNegotiatedLocale()
+        );
+        final ResourceBundle descriptionBundle = ResourceBundle.getBundle(
+            fromAdminPage.getDescriptionBundle(),
+            globalizationHelper.getNegotiatedLocale()
+        );
+
+        final AdminPageModel model = new AdminPageModel();
+        model.setPath(fromAdminPage.getPath());
+        model.setLabel(labelBundle.getString(fromAdminPage.getLabelKey()));
+        model.setDescription(
+            descriptionBundle.getString(
+                fromAdminPage.getDescriptionKey()
+            )
+        );
+        model.setIcon(fromAdminPage.getIcon());
+        return model;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java
index 4151afdcc..99b0b3b58 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java
@@ -18,7 +18,6 @@
  */
 package org.libreccm.ui.admin.systeminformation;
 
-import com.arsdigita.util.SystemInformation;
 import com.arsdigita.util.UncheckedWrapperException;
 
 import java.io.IOException;
@@ -26,7 +25,6 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
index 130bbab34..1b8144474 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
@@ -40,6 +40,11 @@ public class SystemInformationPage implements AdminPage {
         return classes;
     }
 
+    @Override
+    public String getPath() {
+        return "systeminformation";
+    }
+
     @Override
     public String getLabelBundle() {
         return AdminConstants.ADMIN_BUNDLE;
@@ -60,6 +65,11 @@ public class SystemInformationPage implements AdminPage {
         return "systeminformation.description";
     }
 
+    @Override
+    public String getIcon() {
+        return "info-circle-fill";
+    }
+
     @Override
     public int getPosition() {
         return 80;
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
new file mode 100644
index 000000000..233030774
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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} - LibreCCM Admin</title>
+        <link href="#{request.contextPath}/assets/@admin/ccm-admin.css" 
+              rel="stylesheet"/>
+    </head>
+    <body>
+        <header>
+            <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
+                <!--<a class="navbar-brand" href="#">Navbar</a>-->
+                <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" href="#foo">
+                                <svg class="bi"
+                                     width="1em"
+                                     height="1em"
+                                     fill="currentColor">
+                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#info-circle-fill" />
+                                </svg>
+                                <span>Foo</span>
+                            </a>
+                        </li>
+                        <c:forEach items="#{AdminPagesModel.adminPages}" var="page">
+                            <li class="nav-item">
+                                <a class="nav-link" 
+                                   href="#{request.contextPath}/@admin/#{page.path}">
+                                    <svg class="bi"
+                                         width="1em"
+                                         height="1em"
+                                         fill="currentColor">
+                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg##{page.icon}" />
+                                    </svg>
+                                    <span>#{page.label}</span>
+                                </a>
+                            </li>
+                        </c:forEach> 
+                    </ul>
+                </div>
+            </nav>
+        </header>
+        <main>
+            <ui:insert name="main"></ui:insert>
+        </main>
+        <script src="#{request.contextPath}/assets/@admin/ccm-admin.js"></script>
+    </body>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
index 5de79a01c..eb0301220 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
@@ -1,24 +1,24 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:h="http://xmlns.jcp.org/jsf/html">
-    <h:head>
-        <title>System Information</title>
-        <link href="#{request.contextPath}/assets/@admin/ccm-admin.css" 
-              rel="stylesheet"/>
-    </h:head>
-    <h:body>
-        <h1>System Information</h1>
-        <h2>LibreCCM System Information</h2>
-        <dl>
-            <c:forEach items="#{SystemInformationModel.ccmSystemInformation}" 
-                       var="prop">
-                <div>
-                    <dt>#{prop.key}</dt>
-                    <dd>#{prop.value}</dd>
-                </div>
-            </c:forEach>
-        </dl>
-        <script src="#{request.contextPath}/assets/@admin/ccm-admin.js"></script>
-    </h:body>
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="title" value="System Information" />
+        <ui:define name="main">
+            <div class="container">
+                <h1>System Information</h1>
+                <h2>LibreCCM System Information</h2>
+                <dl>
+                    <c:forEach items="#{SystemInformationModel.ccmSystemInformation}" 
+                               var="prop">
+                        <div>
+                            <dt>#{prop.key}</dt>
+                            <dd>#{prop.value}</dd>
+                        </div>
+                    </c:forEach>
+                </dl>
+            </div>
+        </ui:define>
+    </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/assets/bootstrap/bootstrap-icons.svg b/ccm-core/src/main/resources/assets/bootstrap/bootstrap-icons.svg
new file mode 100644
index 000000000..f7731a14b
--- /dev/null
+++ b/ccm-core/src/main/resources/assets/bootstrap/bootstrap-icons.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><symbol viewBox="0 0 16 16" class="bi bi-alarm" fill="currentColor" id="alarm" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.5 0a.5.5 0 000 1H7v1.07a7.001 7.001 0 00-3.273 12.474l-.602.602a.5.5 0 00.707.708l.746-.746A6.97 6.97 0 008 16a6.97 6.97 0 003.422-.892l.746.746a.5.5 0 00.707-.708l-.601-.602A7.001 7.001 0 009 2.07V1h.5a.5.5 0 000-1h-3zm1.038 3.018a6.093 6.093 0 01.924 0 6 6 0 11-.924 0zM8.5 5.5a.5.5 0 00-1 0v3.362l-1.429 2.38a.5.5 0 10.858.515l1.5-2.5A.5.5 0 008.5 9V5.5zM0 3.5c0 .753.333 1.429.86 1.887A8.035 8.035 0 014.387 1.86 2.5 2.5 0 000 3.5zM13.5 1c-.753 0-1.429.333-1.887.86a8.035 8.035 0 013.527 3.527A2.5 2.5 0 0013.5 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-alarm-fill" fill="currentColor" id="alarm-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 .5a.5.5 0 01.5-.5h3a.5.5 0 010 1H9v1.07a7.001 7.001 0 013.274 12.474l.601.602a.5.5 0 01-.707.708l-.746-.746A6.97 6.97 0 018 16a6.97 6.97 0 01-3.422-.892l-.746.746a.5.5 0 01-.707-.708l.602-.602A7.001 7.001 0 017 2.07V1h-.5A.5.5 0 016 .5zM.86 5.387A2.5 2.5 0 114.387 1.86 8.035 8.035 0 00.86 5.387zM11.613 1.86a2.5 2.5 0 113.527 3.527 8.035 8.035 0 00-3.527-3.527zM8.5 5.5a.5.5 0 00-1 0v3.362l-1.429 2.38a.5.5 0 10.858.515l1.5-2.5A.5.5 0 008.5 9V5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-align-bottom" fill="currentColor" id="align-bottom" xmlns="http://www.w3.org/2000/svg"><path d="M6 2a1 1 0 011-1h2a1 1 0 011 1v10a1 1 0 01-1 1H7a1 1 0 01-1-1V2z"/><path fill-rule="evenodd" d="M1 14.5a.5.5 0 01.5-.5h13a.5.5 0 010 1h-13a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-align-center" fill="currentColor" id="align-center" xmlns="http://www.w3.org/2000/svg"><path d="M8 1a.5.5 0 01.5.5V6h-1V1.5A.5.5 0 018 1zm0 14a.5.5 0 01-.5-.5V10h1v4.5a.5.5 0 01-.5.5zM2 7a1 1 0 011-1h10a1 1 0 011 1v2a1 1 0 01-1 1H3a1 1 0 01-1-1V7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-align-end" fill="currentColor" id="align-end" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.5 1a.5.5 0 00-.5.5v13a.5.5 0 001 0v-13a.5.5 0 00-.5-.5z"/><path d="M13 7a1 1 0 00-1-1H2a1 1 0 00-1 1v2a1 1 0 001 1h10a1 1 0 001-1V7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-align-middle" fill="currentColor" id="align-middle" xmlns="http://www.w3.org/2000/svg"><path d="M6 13a1 1 0 001 1h2a1 1 0 001-1V3a1 1 0 00-1-1H7a1 1 0 00-1 1v10zM1 8a.5.5 0 00.5.5H6v-1H1.5A.5.5 0 001 8zm14 0a.5.5 0 01-.5.5H10v-1h4.5a.5.5 0 01.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-align-start" fill="currentColor" id="align-start" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 1a.5.5 0 01.5.5v13a.5.5 0 01-1 0v-13a.5.5 0 01.5-.5z"/><path d="M3 7a1 1 0 011-1h10a1 1 0 011 1v2a1 1 0 01-1 1H4a1 1 0 01-1-1V7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-align-top" fill="currentColor" id="align-top" xmlns="http://www.w3.org/2000/svg"><path d="M6 14a1 1 0 001 1h2a1 1 0 001-1V4a1 1 0 00-1-1H7a1 1 0 00-1 1v10z"/><path fill-rule="evenodd" d="M1 1.5a.5.5 0 00.5.5h13a.5.5 0 000-1h-13a.5.5 0 00-.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-alt" fill="currentColor" id="alt" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 13.5a.5.5 0 00.5.5h3.797a.5.5 0 00.439-.26L11 3h3.5a.5.5 0 000-1h-3.797a.5.5 0 00-.439.26L5 13H1.5a.5.5 0 00-.5.5zm10 0a.5.5 0 00.5.5h3a.5.5 0 000-1h-3a.5.5 0 00-.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-app" fill="currentColor" id="app" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11 2H5a3 3 0 00-3 3v6a3 3 0 003 3h6a3 3 0 003-3V5a3 3 0 00-3-3zM5 1a4 4 0 00-4 4v6a4 4 0 004 4h6a4 4 0 004-4V5a4 4 0 00-4-4H5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-app-indicator" fill="currentColor" id="app-indicator" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.5 2A3.5 3.5 0 002 5.5v5A3.5 3.5 0 005.5 14h5a3.5 3.5 0 003.5-3.5V8a.5.5 0 011 0v2.5a4.5 4.5 0 01-4.5 4.5h-5A4.5 4.5 0 011 10.5v-5A4.5 4.5 0 015.5 1H8a.5.5 0 010 1H5.5z"/><path d="M16 3a3 3 0 11-6 0 3 3 0 016 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-archive" fill="currentColor" id="archive" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a1 1 0 011-1h14a1 1 0 011 1v2a1 1 0 01-1 1v7.5a2.5 2.5 0 01-2.5 2.5h-9A2.5 2.5 0 011 12.5V5a1 1 0 01-1-1V2zm2 3v7.5A1.5 1.5 0 003.5 14h9a1.5 1.5 0 001.5-1.5V5H2zm13-3H1v2h14V2zM5 7.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-archive-fill" fill="currentColor" id="archive-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12.643 15C13.979 15 15 13.845 15 12.5V5H1v7.5C1 13.845 2.021 15 3.357 15h9.286zM5.5 7a.5.5 0 000 1h5a.5.5 0 000-1h-5zM.8 1a.8.8 0 00-.8.8V3a.8.8 0 00.8.8h14.4A.8.8 0 0016 3V1.8a.8.8 0 00-.8-.8H.8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-90deg-down" fill="currentColor" id="arrow-90deg-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.854 14.854a.5.5 0 01-.708 0l-4-4a.5.5 0 01.708-.708L4 13.293V3.5A2.5 2.5 0 016.5 1h8a.5.5 0 010 1h-8A1.5 1.5 0 005 3.5v9.793l3.146-3.147a.5.5 0 01.708.708l-4 4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-90deg-left" fill="currentColor" id="arrow-90deg-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.146 4.854a.5.5 0 010-.708l4-4a.5.5 0 11.708.708L2.707 4H12.5A2.5 2.5 0 0115 6.5v8a.5.5 0 01-1 0v-8A1.5 1.5 0 0012.5 5H2.707l3.147 3.146a.5.5 0 11-.708.708l-4-4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-90deg-right" fill="currentColor" id="arrow-90deg-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.854 4.854a.5.5 0 000-.708l-4-4a.5.5 0 00-.708.708L13.293 4H3.5A2.5 2.5 0 001 6.5v8a.5.5 0 001 0v-8A1.5 1.5 0 013.5 5h9.793l-3.147 3.146a.5.5 0 00.708.708l4-4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-90deg-up" fill="currentColor" id="arrow-90deg-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.854 1.146a.5.5 0 00-.708 0l-4 4a.5.5 0 10.708.708L4 2.707V12.5A2.5 2.5 0 006.5 15h8a.5.5 0 000-1h-8A1.5 1.5 0 015 12.5V2.707l3.146 3.147a.5.5 0 10.708-.708l-4-4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-bar-down" fill="currentColor" id="arrow-bar-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 3.5a.5.5 0 01.5-.5h13a.5.5 0 010 1h-13a.5.5 0 01-.5-.5zM8 6a.5.5 0 01.5.5v5.793l2.146-2.147a.5.5 0 01.708.708l-3 3a.5.5 0 01-.708 0l-3-3a.5.5 0 01.708-.708L7.5 12.293V6.5A.5.5 0 018 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-bar-left" fill="currentColor" id="arrow-bar-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12.5 15a.5.5 0 01-.5-.5v-13a.5.5 0 011 0v13a.5.5 0 01-.5.5zM10 8a.5.5 0 01-.5.5H3.707l2.147 2.146a.5.5 0 01-.708.708l-3-3a.5.5 0 010-.708l3-3a.5.5 0 11.708.708L3.707 7.5H9.5a.5.5 0 01.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-bar-right" fill="currentColor" id="arrow-bar-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 8a.5.5 0 00.5.5h5.793l-2.147 2.146a.5.5 0 00.708.708l3-3a.5.5 0 000-.708l-3-3a.5.5 0 00-.708.708L12.293 7.5H6.5A.5.5 0 006 8zm-2.5 7a.5.5 0 01-.5-.5v-13a.5.5 0 011 0v13a.5.5 0 01-.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-bar-up" fill="currentColor" id="arrow-bar-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 10a.5.5 0 00.5-.5V3.707l2.146 2.147a.5.5 0 00.708-.708l-3-3a.5.5 0 00-.708 0l-3 3a.5.5 0 10.708.708L7.5 3.707V9.5a.5.5 0 00.5.5zm-7 2.5a.5.5 0 01.5-.5h13a.5.5 0 010 1h-13a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-clockwise" fill="currentColor" id="arrow-clockwise" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 3a5 5 0 104.546 2.914.5.5 0 01.908-.417A6 6 0 118 2v1z"/><path d="M8 4.466V.534a.25.25 0 01.41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 018 4.466z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-counterclockwise" fill="currentColor" id="arrow-counterclockwise" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 3a5 5 0 11-4.546 2.914.5.5 0 00-.908-.417A6 6 0 108 2v1z"/><path d="M8 4.466V.534a.25.25 0 00-.41-.192L5.23 2.308a.25.25 0 000 .384l2.36 1.966A.25.25 0 008 4.466z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down" fill="currentColor" id="arrow-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a.5.5 0 01.5.5v11.793l3.146-3.147a.5.5 0 01.708.708l-4 4a.5.5 0 01-.708 0l-4-4a.5.5 0 01.708-.708L7.5 13.293V1.5A.5.5 0 018 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-circle" fill="currentColor" id="arrow-down-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M8 4a.5.5 0 01.5.5v5.793l2.146-2.147a.5.5 0 01.708.708l-3 3a.5.5 0 01-.708 0l-3-3a.5.5 0 11.708-.708L7.5 10.293V4.5A.5.5 0 018 4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-circle-fill" fill="currentColor" id="arrow-down-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zM8.5 4.5a.5.5 0 00-1 0v5.793L5.354 8.146a.5.5 0 10-.708.708l3 3a.5.5 0 00.708 0l3-3a.5.5 0 00-.708-.708L8.5 10.293V4.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-left" fill="currentColor" id="arrow-down-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 13.5a.5.5 0 00.5.5h6a.5.5 0 000-1H3.707L13.854 2.854a.5.5 0 00-.708-.708L3 12.293V7.5a.5.5 0 00-1 0v6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-left-circle" fill="currentColor" id="arrow-down-left-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M10.828 5.172a.5.5 0 00-.707 0L6.025 9.268V6.5a.5.5 0 00-1 0v3.975a.5.5 0 00.5.5H9.5a.5.5 0 000-1H6.732l4.096-4.096a.5.5 0 000-.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-left-circle-fill" fill="currentColor" id="arrow-down-left-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zm-5.879-2.828a.5.5 0 11.707.707L6.732 9.975H9.5a.5.5 0 110 1H5.525a.5.5 0 01-.5-.5V6.5a.5.5 0 111 0v2.768l4.096-4.096z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-left-square" fill="currentColor" id="arrow-down-left-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M10.828 5.172a.5.5 0 00-.707 0L6.025 9.268V6.5a.5.5 0 00-1 0v3.975a.5.5 0 00.5.5H9.5a.5.5 0 000-1H6.732l4.096-4.096a.5.5 0 000-.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-left-square-fill" fill="currentColor" id="arrow-down-left-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm8.121 5.172a.5.5 0 11.707.707L6.732 9.975H9.5a.5.5 0 110 1H5.525a.5.5 0 01-.5-.5V6.5a.5.5 0 111 0v2.768l4.096-4.096z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-right" fill="currentColor" id="arrow-down-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 13.5a.5.5 0 01-.5.5h-6a.5.5 0 010-1h4.793L2.146 2.854a.5.5 0 11.708-.708L13 12.293V7.5a.5.5 0 011 0v6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-right-circle" fill="currentColor" id="arrow-down-right-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M5.172 5.172a.5.5 0 01.707 0l4.096 4.096V6.5a.5.5 0 111 0v3.975a.5.5 0 01-.5.5H6.5a.5.5 0 010-1h2.768L5.172 5.879a.5.5 0 010-.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-right-circle-fill" fill="currentColor" id="arrow-down-right-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zM5.879 5.172a.5.5 0 00-.707.707l4.096 4.096H6.5a.5.5 0 100 1h3.975a.5.5 0 00.5-.5V6.5a.5.5 0 00-1 0v2.768L5.879 5.172z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-right-square" fill="currentColor" id="arrow-down-right-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M5.172 5.172a.5.5 0 01.707 0l4.096 4.096V6.5a.5.5 0 111 0v3.975a.5.5 0 01-.5.5H6.5a.5.5 0 010-1h2.768L5.172 5.879a.5.5 0 010-.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-right-square-fill" fill="currentColor" id="arrow-down-right-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm3.879 5.172a.5.5 0 00-.707.707l4.096 4.096H6.5a.5.5 0 100 1h3.975a.5.5 0 00.5-.5V6.5a.5.5 0 00-1 0v2.768L5.879 5.172z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-short" fill="currentColor" id="arrow-down-short" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 4a.5.5 0 01.5.5v5.793l2.146-2.147a.5.5 0 01.708.708l-3 3a.5.5 0 01-.708 0l-3-3a.5.5 0 11.708-.708L7.5 10.293V4.5A.5.5 0 018 4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-square" fill="currentColor" id="arrow-down-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M8 4a.5.5 0 01.5.5v5.793l2.146-2.147a.5.5 0 01.708.708l-3 3a.5.5 0 01-.708 0l-3-3a.5.5 0 11.708-.708L7.5 10.293V4.5A.5.5 0 018 4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-square-fill" fill="currentColor" id="arrow-down-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm6.5 4.5a.5.5 0 00-1 0v5.793L5.354 8.146a.5.5 0 10-.708.708l3 3a.5.5 0 00.708 0l3-3a.5.5 0 00-.708-.708L8.5 10.293V4.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-down-up" fill="currentColor" id="arrow-down-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.5 15a.5.5 0 00.5-.5V2.707l3.146 3.147a.5.5 0 00.708-.708l-4-4a.5.5 0 00-.708 0l-4 4a.5.5 0 10.708.708L11 2.707V14.5a.5.5 0 00.5.5zm-7-14a.5.5 0 01.5.5v11.793l3.146-3.147a.5.5 0 01.708.708l-4 4a.5.5 0 01-.708 0l-4-4a.5.5 0 01.708-.708L4 13.293V1.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-left" fill="currentColor" id="arrow-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15 8a.5.5 0 00-.5-.5H2.707l3.147-3.146a.5.5 0 10-.708-.708l-4 4a.5.5 0 000 .708l4 4a.5.5 0 00.708-.708L2.707 8.5H14.5A.5.5 0 0015 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-left-circle" fill="currentColor" id="arrow-left-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M12 8a.5.5 0 01-.5.5H5.707l2.147 2.146a.5.5 0 01-.708.708l-3-3a.5.5 0 010-.708l3-3a.5.5 0 11.708.708L5.707 7.5H11.5a.5.5 0 01.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-left-circle-fill" fill="currentColor" id="arrow-left-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zm-4.5.5a.5.5 0 000-1H5.707l2.147-2.146a.5.5 0 10-.708-.708l-3 3a.5.5 0 000 .708l3 3a.5.5 0 00.708-.708L5.707 8.5H11.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-left-right" fill="currentColor" id="arrow-left-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 11.5a.5.5 0 00.5.5h11.793l-3.147 3.146a.5.5 0 00.708.708l4-4a.5.5 0 000-.708l-4-4a.5.5 0 00-.708.708L13.293 11H1.5a.5.5 0 00-.5.5zm14-7a.5.5 0 01-.5.5H2.707l3.147 3.146a.5.5 0 11-.708.708l-4-4a.5.5 0 010-.708l4-4a.5.5 0 11.708.708L2.707 4H14.5a.5.5 0 01.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-left-short" fill="currentColor" id="arrow-left-short" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 8a.5.5 0 01-.5.5H5.707l2.147 2.146a.5.5 0 01-.708.708l-3-3a.5.5 0 010-.708l3-3a.5.5 0 11.708.708L5.707 7.5H11.5a.5.5 0 01.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-left-square" fill="currentColor" id="arrow-left-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M12 8a.5.5 0 01-.5.5H5.707l2.147 2.146a.5.5 0 01-.708.708l-3-3a.5.5 0 010-.708l3-3a.5.5 0 11.708.708L5.707 7.5H11.5a.5.5 0 01.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-left-square-fill" fill="currentColor" id="arrow-left-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm9.5 8.5a.5.5 0 000-1H5.707l2.147-2.146a.5.5 0 10-.708-.708l-3 3a.5.5 0 000 .708l3 3a.5.5 0 00.708-.708L5.707 8.5H11.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-repeat" fill="currentColor" id="arrow-repeat" xmlns="http://www.w3.org/2000/svg"><path d="M11.534 7h3.932a.25.25 0 01.192.41l-1.966 2.36a.25.25 0 01-.384 0l-1.966-2.36a.25.25 0 01.192-.41zm-11 2h3.932a.25.25 0 00.192-.41L2.692 6.23a.25.25 0 00-.384 0L.342 8.59A.25.25 0 00.534 9z"/><path fill-rule="evenodd" d="M8 3c-1.552 0-2.94.707-3.857 1.818a.5.5 0 11-.771-.636A6.002 6.002 0 0113.917 7H12.9A5.002 5.002 0 008 3zM3.1 9a5.002 5.002 0 008.757 2.182.5.5 0 11.771.636A6.002 6.002 0 012.083 9H3.1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-return-left" fill="currentColor" id="arrow-return-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.5 1.5a.5.5 0 01.5.5v4.8a2.5 2.5 0 01-2.5 2.5H2.707l3.347 3.346a.5.5 0 01-.708.708l-4.2-4.2a.5.5 0 010-.708l4-4a.5.5 0 11.708.708L2.707 8.3H12.5A1.5 1.5 0 0014 6.8V2a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-return-right" fill="currentColor" id="arrow-return-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 001 2v4.8a2.5 2.5 0 002.5 2.5h9.793l-3.347 3.346a.5.5 0 00.708.708l4.2-4.2a.5.5 0 000-.708l-4-4a.5.5 0 00-.708.708L13.293 8.3H3.5A1.5 1.5 0 012 6.8V2a.5.5 0 00-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-right" fill="currentColor" id="arrow-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 8a.5.5 0 01.5-.5h11.793l-3.147-3.146a.5.5 0 01.708-.708l4 4a.5.5 0 010 .708l-4 4a.5.5 0 01-.708-.708L13.293 8.5H1.5A.5.5 0 011 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-right-circle" fill="currentColor" id="arrow-right-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M4 8a.5.5 0 00.5.5h5.793l-2.147 2.146a.5.5 0 00.708.708l3-3a.5.5 0 000-.708l-3-3a.5.5 0 10-.708.708L10.293 7.5H4.5A.5.5 0 004 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-right-circle-fill" fill="currentColor" id="arrow-right-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zm-11.5.5a.5.5 0 010-1h5.793L8.146 5.354a.5.5 0 11.708-.708l3 3a.5.5 0 010 .708l-3 3a.5.5 0 01-.708-.708L10.293 8.5H4.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" id="arrow-right-short" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 8a.5.5 0 01.5-.5h5.793L8.146 5.354a.5.5 0 11.708-.708l3 3a.5.5 0 010 .708l-3 3a.5.5 0 01-.708-.708L10.293 8.5H4.5A.5.5 0 014 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-right-square" fill="currentColor" id="arrow-right-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M4 8a.5.5 0 00.5.5h5.793l-2.147 2.146a.5.5 0 00.708.708l3-3a.5.5 0 000-.708l-3-3a.5.5 0 10-.708.708L10.293 7.5H4.5A.5.5 0 004 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-right-square-fill" fill="currentColor" id="arrow-right-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm2.5 8.5a.5.5 0 010-1h5.793L8.146 5.354a.5.5 0 11.708-.708l3 3a.5.5 0 010 .708l-3 3a.5.5 0 01-.708-.708L10.293 8.5H4.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up" fill="currentColor" id="arrow-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15a.5.5 0 00.5-.5V2.707l3.146 3.147a.5.5 0 00.708-.708l-4-4a.5.5 0 00-.708 0l-4 4a.5.5 0 10.708.708L7.5 2.707V14.5a.5.5 0 00.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-circle" fill="currentColor" id="arrow-up-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M8 12a.5.5 0 00.5-.5V5.707l2.146 2.147a.5.5 0 00.708-.708l-3-3a.5.5 0 00-.708 0l-3 3a.5.5 0 10.708.708L7.5 5.707V11.5a.5.5 0 00.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-circle-fill" fill="currentColor" id="arrow-up-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zm-7.5 3.5a.5.5 0 01-1 0V5.707L5.354 7.854a.5.5 0 11-.708-.708l3-3a.5.5 0 01.708 0l3 3a.5.5 0 01-.708.708L8.5 5.707V11.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-left" fill="currentColor" id="arrow-up-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2.5a.5.5 0 01.5-.5h6a.5.5 0 010 1H3.707l10.147 10.146a.5.5 0 01-.708.708L3 3.707V8.5a.5.5 0 01-1 0v-6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-left-circle" fill="currentColor" id="arrow-up-left-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M10.828 10.828a.5.5 0 01-.707 0L6.025 6.732V9.5a.5.5 0 01-1 0V5.525a.5.5 0 01.5-.5H9.5a.5.5 0 010 1H6.732l4.096 4.096a.5.5 0 010 .707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-left-circle-fill" fill="currentColor" id="arrow-up-left-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zm-5.879 2.828a.5.5 0 10.707-.707L6.732 6.025H9.5a.5.5 0 000-1H5.525a.5.5 0 00-.5.5V9.5a.5.5 0 101 0V6.732l4.096 4.096z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-left-square" fill="currentColor" id="arrow-up-left-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M10.828 10.828a.5.5 0 01-.707 0L6.025 6.732V9.5a.5.5 0 01-1 0V5.525a.5.5 0 01.5-.5H9.5a.5.5 0 010 1H6.732l4.096 4.096a.5.5 0 010 .707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-left-square-fill" fill="currentColor" id="arrow-up-left-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm8.121 10.828a.5.5 0 10.707-.707L6.732 6.025H9.5a.5.5 0 000-1H5.525a.5.5 0 00-.5.5V9.5a.5.5 0 001 0V6.732l4.096 4.096z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-right" fill="currentColor" id="arrow-up-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 2.5a.5.5 0 00-.5-.5h-6a.5.5 0 000 1h4.793L2.146 13.146a.5.5 0 00.708.708L13 3.707V8.5a.5.5 0 001 0v-6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-right-circle" fill="currentColor" id="arrow-up-right-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M5.172 10.828a.5.5 0 00.707 0l4.096-4.096V9.5a.5.5 0 101 0V5.525a.5.5 0 00-.5-.5H6.5a.5.5 0 000 1h2.768l-4.096 4.096a.5.5 0 000 .707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-right-circle-fill" fill="currentColor" id="arrow-up-right-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zM5.879 10.828a.5.5 0 11-.707-.707l4.096-4.096H6.5a.5.5 0 010-1h3.975a.5.5 0 01.5.5V9.5a.5.5 0 01-1 0V6.732l-4.096 4.096z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-right-square" fill="currentColor" id="arrow-up-right-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M5.172 10.828a.5.5 0 00.707 0l4.096-4.096V9.5a.5.5 0 101 0V5.525a.5.5 0 00-.5-.5H6.5a.5.5 0 000 1h2.768l-4.096 4.096a.5.5 0 000 .707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-right-square-fill" fill="currentColor" id="arrow-up-right-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm3.879 10.828a.5.5 0 11-.707-.707l4.096-4.096H6.5a.5.5 0 010-1h3.975a.5.5 0 01.5.5V9.5a.5.5 0 01-1 0V6.732l-4.096 4.096z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-short" fill="currentColor" id="arrow-up-short" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 12a.5.5 0 00.5-.5V5.707l2.146 2.147a.5.5 0 00.708-.708l-3-3a.5.5 0 00-.708 0l-3 3a.5.5 0 10.708.708L7.5 5.707V11.5a.5.5 0 00.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-square" fill="currentColor" id="arrow-up-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M8 12a.5.5 0 00.5-.5V5.707l2.146 2.147a.5.5 0 00.708-.708l-3-3a.5.5 0 00-.708 0l-3 3a.5.5 0 10.708.708L7.5 5.707V11.5a.5.5 0 00.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrow-up-square-fill" fill="currentColor" id="arrow-up-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm6.5 4.5a.5.5 0 00-1 0v5.793L5.354 8.146a.5.5 0 10-.708.708l3 3a.5.5 0 00.708 0l3-3a.5.5 0 00-.708-.708L8.5 10.293V4.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrows-angle-contract" fill="currentColor" id="arrows-angle-contract" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.172 15.828a.5.5 0 00.707 0l4.096-4.096V14.5a.5.5 0 101 0v-3.975a.5.5 0 00-.5-.5H1.5a.5.5 0 000 1h2.768L.172 15.121a.5.5 0 000 .707zM15.828.172a.5.5 0 00-.707 0l-4.096 4.096V1.5a.5.5 0 10-1 0v3.975a.5.5 0 00.5.5H14.5a.5.5 0 000-1h-2.768L15.828.879a.5.5 0 000-.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrows-angle-expand" fill="currentColor" id="arrows-angle-expand" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.828 10.172a.5.5 0 00-.707 0l-4.096 4.096V11.5a.5.5 0 00-1 0v3.975a.5.5 0 00.5.5H4.5a.5.5 0 000-1H1.732l4.096-4.096a.5.5 0 000-.707zm4.344-4.344a.5.5 0 00.707 0l4.096-4.096V4.5a.5.5 0 101 0V.525a.5.5 0 00-.5-.5H11.5a.5.5 0 000 1h2.768l-4.096 4.096a.5.5 0 000 .707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrows-collapse" fill="currentColor" id="arrows-collapse" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 8a.5.5 0 01.5-.5h13a.5.5 0 010 1h-13A.5.5 0 011 8zm7-8a.5.5 0 01.5.5v3.793l1.146-1.147a.5.5 0 01.708.708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 11.708-.708L7.5 4.293V.5A.5.5 0 018 0zm-.5 11.707l-1.146 1.147a.5.5 0 01-.708-.708l2-2a.5.5 0 01.708 0l2 2a.5.5 0 01-.708.708L8.5 11.707V15.5a.5.5 0 01-1 0v-3.793z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrows-expand" fill="currentColor" id="arrows-expand" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 8a.5.5 0 01.5-.5h13a.5.5 0 010 1h-13A.5.5 0 011 8zM7.646.146a.5.5 0 01.708 0l2 2a.5.5 0 01-.708.708L8.5 1.707V5.5a.5.5 0 01-1 0V1.707L6.354 2.854a.5.5 0 11-.708-.708l2-2zM8 10a.5.5 0 01.5.5v3.793l1.146-1.147a.5.5 0 01.708.708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 01.708-.708L7.5 14.293V10.5A.5.5 0 018 10z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrows-fullscreen" fill="currentColor" id="arrows-fullscreen" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.828 10.172a.5.5 0 00-.707 0l-4.096 4.096V11.5a.5.5 0 00-1 0v3.975a.5.5 0 00.5.5H4.5a.5.5 0 000-1H1.732l4.096-4.096a.5.5 0 000-.707zm4.344 0a.5.5 0 01.707 0l4.096 4.096V11.5a.5.5 0 111 0v3.975a.5.5 0 01-.5.5H11.5a.5.5 0 010-1h2.768l-4.096-4.096a.5.5 0 010-.707zm0-4.344a.5.5 0 00.707 0l4.096-4.096V4.5a.5.5 0 101 0V.525a.5.5 0 00-.5-.5H11.5a.5.5 0 000 1h2.768l-4.096 4.096a.5.5 0 000 .707zm-4.344 0a.5.5 0 01-.707 0L1.025 1.732V4.5a.5.5 0 01-1 0V.525a.5.5 0 01.5-.5H4.5a.5.5 0 010 1H1.732l4.096 4.096a.5.5 0 010 .707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-arrows-move" fill="currentColor" id="arrows-move" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.646.146a.5.5 0 01.708 0l2 2a.5.5 0 01-.708.708L8.5 1.707V5.5a.5.5 0 01-1 0V1.707L6.354 2.854a.5.5 0 11-.708-.708l2-2zM8 10a.5.5 0 01.5.5v3.793l1.146-1.147a.5.5 0 01.708.708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 01.708-.708L7.5 14.293V10.5A.5.5 0 018 10zM.146 8.354a.5.5 0 010-.708l2-2a.5.5 0 11.708.708L1.707 7.5H5.5a.5.5 0 010 1H1.707l1.147 1.146a.5.5 0 01-.708.708l-2-2zM10 8a.5.5 0 01.5-.5h3.793l-1.147-1.146a.5.5 0 01.708-.708l2 2a.5.5 0 010 .708l-2 2a.5.5 0 01-.708-.708L14.293 8.5H10.5A.5.5 0 0110 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-aspect-ratio" fill="currentColor" id="aspect-ratio" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 3.5A1.5 1.5 0 011.5 2h13A1.5 1.5 0 0116 3.5v9a1.5 1.5 0 01-1.5 1.5h-13A1.5 1.5 0 010 12.5v-9zM1.5 3a.5.5 0 00-.5.5v9a.5.5 0 00.5.5h13a.5.5 0 00.5-.5v-9a.5.5 0 00-.5-.5h-13z"/><path fill-rule="evenodd" d="M2 4.5a.5.5 0 01.5-.5h3a.5.5 0 010 1H3v2.5a.5.5 0 01-1 0v-3zm12 7a.5.5 0 01-.5.5h-3a.5.5 0 010-1H13V8.5a.5.5 0 011 0v3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-aspect-ratio-fill" fill="currentColor" id="aspect-ratio-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 2A1.5 1.5 0 000 3.5v9A1.5 1.5 0 001.5 14h13a1.5 1.5 0 001.5-1.5v-9A1.5 1.5 0 0014.5 2h-13zm1 2a.5.5 0 00-.5.5v3a.5.5 0 001 0V5h2.5a.5.5 0 000-1h-3zm11 8a.5.5 0 00.5-.5v-3a.5.5 0 00-1 0V11h-2.5a.5.5 0 000 1h3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-asterisk" fill="currentColor" id="asterisk" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 0a1 1 0 011 1v5.268l4.562-2.634a1 1 0 111 1.732L10 8l4.562 2.634a1 1 0 11-1 1.732L9 9.732V15a1 1 0 11-2 0V9.732l-4.562 2.634a1 1 0 11-1-1.732L6 8 1.438 5.366a1 1 0 011-1.732L7 6.268V1a1 1 0 011-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-at" fill="currentColor" id="at" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13.106 7.222c0-2.967-2.249-5.032-5.482-5.032-3.35 0-5.646 2.318-5.646 5.702 0 3.493 2.235 5.708 5.762 5.708.862 0 1.689-.123 2.304-.335v-.862c-.43.199-1.354.328-2.29.328-2.926 0-4.813-1.88-4.813-4.798 0-2.844 1.921-4.881 4.594-4.881 2.735 0 4.608 1.688 4.608 4.156 0 1.682-.554 2.769-1.416 2.769-.492 0-.772-.28-.772-.76V5.206H8.923v.834h-.11c-.266-.595-.881-.964-1.6-.964-1.4 0-2.378 1.162-2.378 2.823 0 1.737.957 2.906 2.379 2.906.8 0 1.415-.39 1.709-1.087h.11c.081.67.703 1.148 1.503 1.148 1.572 0 2.57-1.415 2.57-3.643zm-7.177.704c0-1.197.54-1.907 1.456-1.907.93 0 1.524.738 1.524 1.907S8.308 9.84 7.371 9.84c-.895 0-1.442-.725-1.442-1.914z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-award" fill="currentColor" id="award" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.669.864L8 0 6.331.864l-1.858.282-.842 1.68-1.337 1.32L2.6 6l-.306 1.854 1.337 1.32.842 1.68 1.858.282L8 12l1.669-.864 1.858-.282.842-1.68 1.337-1.32L13.4 6l.306-1.854-1.337-1.32-.842-1.68L9.669.864zm1.196 1.193l-1.51-.229L8 1.126l-1.355.702-1.51.229-.684 1.365-1.086 1.072L3.614 6l-.25 1.506 1.087 1.072.684 1.365 1.51.229L8 10.874l1.356-.702 1.509-.229.684-1.365 1.086-1.072L12.387 6l.248-1.506-1.086-1.072-.684-1.365z"/><path d="M4 11.794V16l4-1 4 1v-4.206l-2.018.306L8 13.126 6.018 12.1 4 11.794z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-award-fill" fill="currentColor" id="award-fill" xmlns="http://www.w3.org/2000/svg"><path d="M8 0l1.669.864 1.858.282.842 1.68 1.337 1.32L13.4 6l.306 1.854-1.337 1.32-.842 1.68-1.858.282L8 12l-1.669-.864-1.858-.282-.842-1.68-1.337-1.32L2.6 6l-.306-1.854 1.337-1.32.842-1.68L6.331.864 8 0z"/><path d="M4 11.794V16l4-1 4 1v-4.206l-2.018.306L8 13.126 6.018 12.1 4 11.794z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-back" fill="currentColor" id="back" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h8a2 2 0 012 2v2h2a2 2 0 012 2v8a2 2 0 01-2 2H6a2 2 0 01-2-2v-2H2a2 2 0 01-2-2V2zm2-1a1 1 0 00-1 1v8a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-backspace" fill="currentColor" id="backspace" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.603 2h7.08a1 1 0 011 1v10a1 1 0 01-1 1h-7.08a1 1 0 01-.76-.35L1 8l4.844-5.65A1 1 0 016.603 2zm7.08-1a2 2 0 012 2v10a2 2 0 01-2 2h-7.08a2 2 0 01-1.519-.698L.241 8.65a1 1 0 010-1.302L5.084 1.7A2 2 0 016.603 1h7.08zM5.829 5.146a.5.5 0 000 .708L7.976 8l-2.147 2.146a.5.5 0 00.707.708l2.147-2.147 2.146 2.147a.5.5 0 00.707-.708L9.39 8l2.146-2.146a.5.5 0 00-.707-.708L8.683 7.293 6.536 5.146a.5.5 0 00-.707 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-backspace-fill" fill="currentColor" id="backspace-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15.683 3a2 2 0 00-2-2h-7.08a2 2 0 00-1.519.698L.241 7.35a1 1 0 000 1.302l4.843 5.65A2 2 0 006.603 15h7.08a2 2 0 002-2V3zM5.829 5.854a.5.5 0 11.707-.708l2.147 2.147 2.146-2.147a.5.5 0 11.707.708L9.39 8l2.146 2.146a.5.5 0 01-.707.708L8.683 8.707l-2.147 2.147a.5.5 0 01-.707-.708L7.976 8 5.829 5.854z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-backspace-reverse" fill="currentColor" id="backspace-reverse" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.08 2H2a1 1 0 00-1 1v10a1 1 0 001 1h7.08a1 1 0 00.76-.35L14.682 8 9.839 2.35A1 1 0 009.08 2zM2 1a2 2 0 00-2 2v10a2 2 0 002 2h7.08a2 2 0 001.519-.698l4.843-5.651a1 1 0 000-1.302L10.6 1.7A2 2 0 009.08 1H2zm7.854 4.146a.5.5 0 010 .708L7.707 8l2.147 2.146a.5.5 0 01-.708.708L7 8.707l-2.146 2.147a.5.5 0 01-.708-.708L6.293 8 4.146 5.854a.5.5 0 11.708-.708L7 7.293l2.146-2.147a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-backspace-reverse-fill" fill="currentColor" id="backspace-reverse-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 3a2 2 0 012-2h7.08a2 2 0 011.519.698l4.843 5.651a1 1 0 010 1.302L10.6 14.3a2 2 0 01-1.52.7H2a2 2 0 01-2-2V3zm9.854 2.854a.5.5 0 00-.708-.708L7 7.293 4.854 5.146a.5.5 0 10-.708.708L6.293 8l-2.147 2.146a.5.5 0 00.708.708L7 8.707l2.146 2.147a.5.5 0 00.708-.708L7.707 8l2.147-2.146z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-4k" fill="currentColor" id="badge-4k" xmlns="http://www.w3.org/2000/svg"><path d="M4.807 5.001C4.021 6.298 3.203 7.6 2.5 8.917v.971h2.905V11h1.112V9.888h.733V8.93h-.733V5.001h-1.71zm-1.23 3.93v-.032a46.781 46.781 0 011.766-3.001h.062V8.93H3.577zm9.831-3.93h-1.306L9.835 7.687h-.057V5H8.59v6h1.187V9.075l.615-.699L12.072 11H13.5l-2.232-3.415 2.14-2.584z"/><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v8a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-4k-fill" fill="currentColor" id="badge-4k-fill" xmlns="http://www.w3.org/2000/svg"><path d="M3.577 8.9v.03h1.828V5.898h-.062a46.781 46.781 0 00-1.766 3.001z"/><path fill-rule="evenodd" d="M2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2zm2.372 3.715l.435-.714h1.71v3.93h.733v.957h-.733V11H5.405V9.888H2.5v-.971c.574-1.077 1.225-2.142 1.872-3.202zm7.73-.714h1.306l-2.14 2.584L13.5 11h-1.428l-1.679-2.624-.615.7V11H8.59V5.001h1.187v2.686h.057L12.102 5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-8k" fill="currentColor" id="badge-8k" xmlns="http://www.w3.org/2000/svg"><path d="M4.837 11.114c1.406 0 2.333-.725 2.333-1.766 0-.945-.712-1.38-1.256-1.49v-.053c.496-.15 1.02-.55 1.02-1.331 0-.914-.831-1.587-2.084-1.587-1.257 0-2.087.673-2.087 1.587 0 .773.51 1.177 1.02 1.331v.053c-.546.11-1.258.54-1.258 1.494 0 1.042.906 1.762 2.312 1.762zm.013-3.643c-.545 0-.95-.356-.95-.866s.405-.852.95-.852c.545 0 .945.343.945.852 0 .51-.4.866-.945.866zm0 2.786c-.65 0-1.142-.395-1.142-.984S4.2 8.28 4.85 8.28c.646 0 1.143.404 1.143.993s-.497.984-1.143.984zM13.408 5h-1.306L9.835 7.685h-.057V5H8.59v5.998h1.187V9.075l.615-.699 1.679 2.623H13.5l-2.232-3.414L13.408 5z"/><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v8a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-8k-fill" fill="currentColor" id="badge-8k-fill" xmlns="http://www.w3.org/2000/svg"><path d="M3.9 6.605c0 .51.405.866.95.866.545 0 .945-.356.945-.866s-.4-.852-.945-.852c-.545 0-.95.343-.95.852zm-.192 2.668c0 .589.492.984 1.142.984.646 0 1.143-.395 1.143-.984S5.496 8.28 4.85 8.28c-.65 0-1.142.404-1.142.993z"/><path fill-rule="evenodd" d="M2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2zm5.17 7.348c0 1.041-.927 1.766-2.333 1.766-1.406 0-2.312-.72-2.312-1.762 0-.954.712-1.384 1.257-1.494v-.053c-.51-.154-1.02-.558-1.02-1.331 0-.914.831-1.587 2.088-1.587 1.253 0 2.083.673 2.083 1.587 0 .782-.523 1.182-1.02 1.331v.053c.545.11 1.257.545 1.257 1.49zM12.102 5h1.306l-2.14 2.584 2.232 3.415h-1.428l-1.679-2.624-.615.699v1.925H8.59V5h1.187v2.685h.057L12.102 5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-ad" fill="currentColor" id="badge-ad" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v8a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/><path d="M3.7 11l.47-1.542h2.004L6.644 11h1.261L5.901 5.001H4.513L2.5 11h1.2zm1.503-4.852l.734 2.426H4.416l.734-2.426h.053zm4.759.128c-1.059 0-1.753.765-1.753 2.043v.695c0 1.279.685 2.043 1.74 2.043.677 0 1.222-.33 1.367-.804h.057V11h1.138V4.685h-1.16v2.36h-.053c-.18-.475-.68-.77-1.336-.77zm.387.923c.58 0 1.002.44 1.002 1.138v.602c0 .76-.396 1.2-.984 1.2-.598 0-.972-.449-.972-1.248v-.453c0-.795.37-1.24.954-1.24z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-ad-fill" fill="currentColor" id="badge-ad-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2zm6.209 6.32c0-1.28.694-2.044 1.753-2.044.655 0 1.156.294 1.336.769h.053v-2.36h1.16V11h-1.138v-.747h-.057c-.145.474-.69.804-1.367.804-1.055 0-1.74-.764-1.74-2.043v-.695zm3.142.017c0-.699-.422-1.138-1.002-1.138-.584 0-.954.444-.954 1.239v.453c0 .8.374 1.248.972 1.248.588 0 .984-.44.984-1.2v-.602zM4.17 9.457L3.7 11H2.5l2.013-5.999H5.9L7.905 11H6.644l-.47-1.542H4.17zm1.767-.883l-.734-2.426H5.15l-.734 2.426h1.52z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-cc" fill="currentColor" id="badge-cc" xmlns="http://www.w3.org/2000/svg"><path d="M3.708 7.755c0-1.111.488-1.753 1.319-1.753.681 0 1.138.47 1.186 1.107H7.36V7c-.052-1.186-1.024-2-2.342-2C3.414 5 2.5 6.05 2.5 7.751v.747c0 1.7.905 2.73 2.518 2.73 1.314 0 2.285-.792 2.342-1.939v-.114H6.213c-.048.615-.496 1.05-1.186 1.05-.84 0-1.319-.62-1.319-1.727v-.743zm6.14 0c0-1.111.488-1.753 1.318-1.753.682 0 1.139.47 1.187 1.107H13.5V7c-.053-1.186-1.024-2-2.342-2C9.554 5 8.64 6.05 8.64 7.751v.747c0 1.7.905 2.73 2.518 2.73 1.314 0 2.285-.792 2.342-1.939v-.114h-1.147c-.048.615-.497 1.05-1.187 1.05-.839 0-1.318-.62-1.318-1.727v-.743z"/><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v8a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-cc-fill" fill="currentColor" id="badge-cc-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2zm3.027 4.002c-.83 0-1.319.642-1.319 1.753v.743c0 1.107.48 1.727 1.319 1.727.69 0 1.138-.435 1.186-1.05H7.36v.114c-.057 1.147-1.028 1.938-2.342 1.938-1.613 0-2.518-1.028-2.518-2.729v-.747C2.5 6.051 3.414 5 5.018 5c1.318 0 2.29.813 2.342 2v.11H6.213c-.048-.638-.505-1.108-1.186-1.108zm6.14 0c-.831 0-1.319.642-1.319 1.753v.743c0 1.107.48 1.727 1.318 1.727.69 0 1.139-.435 1.187-1.05H13.5v.114c-.057 1.147-1.028 1.938-2.342 1.938-1.613 0-2.518-1.028-2.518-2.729v-.747c0-1.7.914-2.751 2.518-2.751 1.318 0 2.29.813 2.342 2v.11h-1.147c-.048-.638-.505-1.108-1.187-1.108z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-hd" fill="currentColor" id="badge-hd" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v8a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/><path d="M7.396 11V5.001H6.209v2.44H3.687V5H2.5v6h1.187V8.43h2.522V11h1.187zM8.5 5.001V11h2.188c1.811 0 2.685-1.107 2.685-3.015 0-1.894-.86-2.984-2.684-2.984H8.5zm1.187.967h.843c1.112 0 1.622.686 1.622 2.04 0 1.353-.505 2.02-1.622 2.02h-.843v-4.06z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-hd-fill" fill="currentColor" id="badge-hd-fill" xmlns="http://www.w3.org/2000/svg"><path d="M10.53 5.968h-.843v4.06h.843c1.117 0 1.622-.667 1.622-2.02 0-1.354-.51-2.04-1.622-2.04z"/><path fill-rule="evenodd" d="M2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2zm5.396 3.001V11H6.209V8.43H3.687V11H2.5V5.001h1.187v2.44h2.522V5h1.187zM8.5 11V5.001h2.188c1.824 0 2.685 1.09 2.685 2.984C13.373 9.893 12.5 11 10.69 11H8.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-tm" fill="currentColor" id="badge-tm" xmlns="http://www.w3.org/2000/svg"><path d="M5.295 11V5.995H7V5H2.403v.994h1.701V11h1.19zm3.397 0V7.01h.058l1.428 3.239h.773l1.42-3.24h.057V11H13.5V5.001h-1.2l-1.71 3.894h-.039l-1.71-3.894H7.634V11h1.06z"/><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v8a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-tm-fill" fill="currentColor" id="badge-tm-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2zm3.295 3.995V11H4.104V5.995h-1.7V5H7v.994H5.295zM8.692 7.01V11H7.633V5.001h1.209l1.71 3.894h.039l1.71-3.894H13.5V11h-1.072V7.01h-.057l-1.42 3.239h-.773L8.75 7.008h-.058z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-vo" fill="currentColor" id="badge-vo" xmlns="http://www.w3.org/2000/svg"><path d="M4.508 11h1.429l1.99-5.999H6.61L5.277 9.708H5.22L3.875 5.001H2.5L4.508 11zM13.5 8.39v-.77c0-1.696-.962-2.733-2.566-2.733-1.604 0-2.571 1.029-2.571 2.734v.769c0 1.691.967 2.724 2.57 2.724 1.605 0 2.567-1.033 2.567-2.724zm-1.204-.778v.782c0 1.156-.571 1.732-1.362 1.732-.796 0-1.363-.576-1.363-1.732v-.782c0-1.156.567-1.736 1.363-1.736.79 0 1.362.58 1.362 1.736z"/><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v8a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-badge-vo-fill" fill="currentColor" id="badge-vo-fill" xmlns="http://www.w3.org/2000/svg"><path d="M12.296 8.394v-.782c0-1.156-.571-1.736-1.362-1.736-.796 0-1.363.58-1.363 1.736v.782c0 1.156.567 1.732 1.363 1.732.79 0 1.362-.576 1.362-1.732z"/><path fill-rule="evenodd" d="M2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2zm11.5 5.62v.77c0 1.691-.962 2.724-2.566 2.724-1.604 0-2.571-1.033-2.571-2.724v-.77c0-1.704.967-2.733 2.57-2.733 1.605 0 2.567 1.037 2.567 2.734zM5.937 11H4.508L2.5 5.001h1.375L5.22 9.708h.057L6.61 5.001h1.318L5.937 11z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bag" fill="currentColor" id="bag" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a2.5 2.5 0 00-2.5 2.5V4h5v-.5A2.5 2.5 0 008 1zm3.5 3v-.5a3.5 3.5 0 10-7 0V4H1v10a2 2 0 002 2h10a2 2 0 002-2V4h-3.5zM2 5v9a1 1 0 001 1h10a1 1 0 001-1V5H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bag-check" fill="currentColor" id="bag-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a2.5 2.5 0 00-2.5 2.5V4h5v-.5A2.5 2.5 0 008 1zm3.5 3v-.5a3.5 3.5 0 10-7 0V4H1v10a2 2 0 002 2h10a2 2 0 002-2V4h-3.5zM2 5v9a1 1 0 001 1h10a1 1 0 001-1V5H2z"/><path fill-rule="evenodd" d="M10.854 8.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 01.708-.708L7.5 10.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bag-check-fill" fill="currentColor" id="bag-check-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.5 3.5a2.5 2.5 0 015 0V4h-5v-.5zm6 0V4H15v10a2 2 0 01-2 2H3a2 2 0 01-2-2V4h3.5v-.5a3.5 3.5 0 117 0zm-.646 5.354a.5.5 0 00-.708-.708L7.5 10.793 6.354 9.646a.5.5 0 10-.708.708l1.5 1.5a.5.5 0 00.708 0l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bag-dash" fill="currentColor" id="bag-dash" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a2.5 2.5 0 00-2.5 2.5V4h5v-.5A2.5 2.5 0 008 1zm3.5 3v-.5a3.5 3.5 0 10-7 0V4H1v10a2 2 0 002 2h10a2 2 0 002-2V4h-3.5zM2 5v9a1 1 0 001 1h10a1 1 0 001-1V5H2z"/><path fill-rule="evenodd" d="M5.5 10a.5.5 0 01.5-.5h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bag-dash-fill" fill="currentColor" id="bag-dash-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.5 3.5a2.5 2.5 0 015 0V4h-5v-.5zm6 0V4H15v10a2 2 0 01-2 2H3a2 2 0 01-2-2V4h3.5v-.5a3.5 3.5 0 117 0zM6 9.5a.5.5 0 000 1h4a.5.5 0 000-1H6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bag-fill" fill="currentColor" id="bag-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a2.5 2.5 0 00-2.5 2.5V4h5v-.5A2.5 2.5 0 008 1zm3.5 3v-.5a3.5 3.5 0 10-7 0V4H1v10a2 2 0 002 2h10a2 2 0 002-2V4h-3.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bag-plus" fill="currentColor" id="bag-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a2.5 2.5 0 00-2.5 2.5V4h5v-.5A2.5 2.5 0 008 1zm3.5 3v-.5a3.5 3.5 0 10-7 0V4H1v10a2 2 0 002 2h10a2 2 0 002-2V4h-3.5zM2 5v9a1 1 0 001 1h10a1 1 0 001-1V5H2z"/><path fill-rule="evenodd" d="M8 7.5a.5.5 0 01.5.5v1.5H10a.5.5 0 010 1H8.5V12a.5.5 0 01-1 0v-1.5H6a.5.5 0 010-1h1.5V8a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bag-plus-fill" fill="currentColor" id="bag-plus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.5 3.5a2.5 2.5 0 015 0V4h-5v-.5zm6 0V4H15v10a2 2 0 01-2 2H3a2 2 0 01-2-2V4h3.5v-.5a3.5 3.5 0 117 0zM8.5 8a.5.5 0 00-1 0v1.5H6a.5.5 0 000 1h1.5V12a.5.5 0 001 0v-1.5H10a.5.5 0 000-1H8.5V8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bag-x" fill="currentColor" id="bag-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a2.5 2.5 0 00-2.5 2.5V4h5v-.5A2.5 2.5 0 008 1zm3.5 3v-.5a3.5 3.5 0 10-7 0V4H1v10a2 2 0 002 2h10a2 2 0 002-2V4h-3.5zM2 5v9a1 1 0 001 1h10a1 1 0 001-1V5H2z"/><path fill-rule="evenodd" d="M6.146 8.146a.5.5 0 01.708 0L8 9.293l1.146-1.147a.5.5 0 11.708.708L8.707 10l1.147 1.146a.5.5 0 01-.708.708L8 10.707l-1.146 1.147a.5.5 0 01-.708-.708L7.293 10 6.146 8.854a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bag-x-fill" fill="currentColor" id="bag-x-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.5 3.5a2.5 2.5 0 015 0V4h-5v-.5zm6 0V4H15v10a2 2 0 01-2 2H3a2 2 0 01-2-2V4h3.5v-.5a3.5 3.5 0 117 0zM6.854 8.146a.5.5 0 10-.708.708L7.293 10l-1.147 1.146a.5.5 0 00.708.708L8 10.707l1.146 1.147a.5.5 0 00.708-.708L8.707 10l1.147-1.146a.5.5 0 00-.708-.708L8 9.293 6.854 8.146z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bar-chart" fill="currentColor" id="bar-chart" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 11H2v3h2v-3zm5-4H7v7h2V7zm5-5h-2v12h2V2zm-2-1a1 1 0 00-1 1v12a1 1 0 001 1h2a1 1 0 001-1V2a1 1 0 00-1-1h-2zM6 7a1 1 0 011-1h2a1 1 0 011 1v7a1 1 0 01-1 1H7a1 1 0 01-1-1V7zm-5 4a1 1 0 011-1h2a1 1 0 011 1v3a1 1 0 01-1 1H2a1 1 0 01-1-1v-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bar-chart-fill" fill="currentColor" id="bar-chart-fill" xmlns="http://www.w3.org/2000/svg"><rect width="4" height="5" x="1" y="10" rx="1"/><rect width="4" height="9" x="6" y="6" rx="1"/><rect width="4" height="14" x="11" y="1" rx="1"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bar-chart-line" fill="currentColor" id="bar-chart-line" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11 2a1 1 0 011-1h2a1 1 0 011 1v12h.5a.5.5 0 010 1H.5a.5.5 0 010-1H1v-3a1 1 0 011-1h2a1 1 0 011 1v3h1V7a1 1 0 011-1h2a1 1 0 011 1v7h1V2zm1 12h2V2h-2v12zm-3 0V7H7v7h2zm-5 0v-3H2v3h2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bar-chart-line-fill" fill="currentColor" id="bar-chart-line-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11 2a1 1 0 011-1h2a1 1 0 011 1v12h.5a.5.5 0 010 1H.5a.5.5 0 010-1H1v-3a1 1 0 011-1h2a1 1 0 011 1v3h1V7a1 1 0 011-1h2a1 1 0 011 1v7h1V2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bar-chart-steps" fill="currentColor" id="bar-chart-steps" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.5 0a.5.5 0 01.5.5v15a.5.5 0 01-1 0V.5A.5.5 0 01.5 0z"/><rect width="5" height="2" x="2" y="1" rx=".5"/><rect width="8" height="2" x="4" y="5" rx=".5"/><path d="M6 9.5a.5.5 0 01.5-.5h6a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-6a.5.5 0 01-.5-.5v-1zm2 4a.5.5 0 01.5-.5h7a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-7a.5.5 0 01-.5-.5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-basket" fill="currentColor" id="basket" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.757 1.071a.5.5 0 01.172.686L3.383 6h9.234L10.07 1.757a.5.5 0 11.858-.514L13.783 6H15a1 1 0 011 1v1a1 1 0 01-1 1v4.5a2.5 2.5 0 01-2.5 2.5h-9A2.5 2.5 0 011 13.5V9a1 1 0 01-1-1V7a1 1 0 011-1h1.217L5.07 1.243a.5.5 0 01.686-.172zM2 9v4.5A1.5 1.5 0 003.5 15h9a1.5 1.5 0 001.5-1.5V9H2zM1 7v1h14V7H1zm3 3a.5.5 0 01.5.5v3a.5.5 0 01-1 0v-3A.5.5 0 014 10zm2 0a.5.5 0 01.5.5v3a.5.5 0 01-1 0v-3A.5.5 0 016 10zm2 0a.5.5 0 01.5.5v3a.5.5 0 01-1 0v-3A.5.5 0 018 10zm2 0a.5.5 0 01.5.5v3a.5.5 0 01-1 0v-3a.5.5 0 01.5-.5zm2 0a.5.5 0 01.5.5v3a.5.5 0 01-1 0v-3a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-basket-fill" fill="currentColor" id="basket-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.071 1.243a.5.5 0 01.858.514L3.383 6h9.234L10.07 1.757a.5.5 0 11.858-.514L13.783 6H15.5a.5.5 0 01.5.5v2a.5.5 0 01-.5.5H15v5a2 2 0 01-2 2H3a2 2 0 01-2-2V9H.5a.5.5 0 01-.5-.5v-2A.5.5 0 01.5 6h1.717L5.07 1.243zM3.5 10.5a.5.5 0 10-1 0v3a.5.5 0 001 0v-3zm2.5 0a.5.5 0 10-1 0v3a.5.5 0 001 0v-3zm2.5 0a.5.5 0 10-1 0v3a.5.5 0 001 0v-3zm2.5 0a.5.5 0 10-1 0v3a.5.5 0 001 0v-3zm2.5 0a.5.5 0 10-1 0v3a.5.5 0 001 0v-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-basket2" fill="currentColor" id="basket2" xmlns="http://www.w3.org/2000/svg"><path d="M4 10a1 1 0 012 0v2a1 1 0 01-2 0v-2zm3 0a1 1 0 012 0v2a1 1 0 01-2 0v-2zm3 0a1 1 0 112 0v2a1 1 0 01-2 0v-2z"/><path fill-rule="evenodd" d="M5.757 1.071a.5.5 0 01.172.686L3.383 6h9.234L10.07 1.757a.5.5 0 11.858-.514L13.783 6H15.5a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-.623l-1.844 6.456a.75.75 0 01-.722.544H3.69a.75.75 0 01-.722-.544L1.123 8H.5a.5.5 0 01-.5-.5v-1A.5.5 0 01.5 6h1.717L5.07 1.243a.5.5 0 01.686-.172zM2.163 8l1.714 6h8.246l1.714-6H2.163z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-basket2-fill" fill="currentColor" id="basket2-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.929 1.757a.5.5 0 10-.858-.514L2.217 6H.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h.623l1.844 6.456A.75.75 0 003.69 15h8.622a.75.75 0 00.722-.544L14.877 8h.623a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1.717L10.93 1.243a.5.5 0 10-.858.514L12.617 6H3.383L5.93 1.757zM4 10a1 1 0 012 0v2a1 1 0 11-2 0v-2zm3 0a1 1 0 012 0v2a1 1 0 11-2 0v-2zm4-1a1 1 0 00-1 1v2a1 1 0 102 0v-2a1 1 0 00-1-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-basket3" fill="currentColor" id="basket3" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.757 1.071a.5.5 0 01.172.686L3.383 6h9.234L10.07 1.757a.5.5 0 11.858-.514L13.783 6H15.5a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H.5a.5.5 0 01-.5-.5v-1A.5.5 0 01.5 6h1.717L5.07 1.243a.5.5 0 01.686-.172zM3.394 15l-1.48-6h-.97l1.525 6.426a.75.75 0 00.729.574h9.606a.75.75 0 00.73-.574L15.056 9h-.972l-1.479 6h-9.21z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-basket3-fill" fill="currentColor" id="basket3-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.757 1.071a.5.5 0 01.172.686L3.383 6h9.234L10.07 1.757a.5.5 0 11.858-.514L13.783 6H15.5a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H.5a.5.5 0 01-.5-.5v-1A.5.5 0 01.5 6h1.717L5.07 1.243a.5.5 0 01.686-.172z"/><path d="M2.468 15.426L.943 9h14.114l-1.525 6.426a.75.75 0 01-.729.574H3.197a.75.75 0 01-.73-.574z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-battery" fill="currentColor" id="battery" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 5H2a1 1 0 00-1 1v4a1 1 0 001 1h10a1 1 0 001-1V6a1 1 0 00-1-1zM2 4a2 2 0 00-2 2v4a2 2 0 002 2h10a2 2 0 002-2V6a2 2 0 00-2-2H2z"/><path d="M14.5 9.5a1.5 1.5 0 000-3v3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-battery-charging" fill="currentColor" id="battery-charging" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 9.5a1.5 1.5 0 000-3v3z"/><path fill-rule="evenodd" d="M9.585 2.568a.5.5 0 01.226.58L8.677 6.832h1.99a.5.5 0 01.364.843l-5.334 5.667a.5.5 0 01-.842-.49L5.99 9.167H4a.5.5 0 01-.364-.843l5.333-5.667a.5.5 0 01.616-.09z"/><path fill-rule="evenodd" d="M6.332 4H2a2 2 0 00-2 2v4a2 2 0 002 2h2.072l.307-1H2a1 1 0 01-1-1V6a1 1 0 011-1h3.391l.941-1zM4.45 6H2v4h1.313a1.5 1.5 0 01-.405-2.361L4.45 6zm.976 5l-.308 1H6.96l.21-.224h.001l.73-.776H6.53l-.085.09.028-.09H5.426zm1.354-1H5.733l.257-.833H4a.5.5 0 01-.364-.843l.793-.843L5.823 6h1.373L5.157 8.167h1.51a.5.5 0 01.478.647L6.78 10zm.69 0h1.374l1.394-1.482.793-.842a.5.5 0 00-.364-.843h-1.99L8.933 6H7.887l-.166.54-.199.646A.5.5 0 008 7.833h1.51L7.47 10zm.725-5H9.24l.308-1H7.706l-.942 1h1.374l.085-.09-.028.09zm2.4-1l-.308 1H12a1 1 0 011 1v4a1 1 0 01-1 1H9.276l-.942 1H12a2 2 0 002-2V6a2 2 0 00-2-2h-1.405zm-.378 6H12V8.02a1.499 1.499 0 01-.241.341L10.217 10zM12 6.646V6h-.646a1.5 1.5 0 01.646.646z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-battery-full" fill="currentColor" id="battery-full" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 5H2a1 1 0 00-1 1v4a1 1 0 001 1h10a1 1 0 001-1V6a1 1 0 00-1-1zM2 4a2 2 0 00-2 2v4a2 2 0 002 2h10a2 2 0 002-2V6a2 2 0 00-2-2H2z"/><path d="M2 6h10v4H2V6zm12.5 3.5a1.5 1.5 0 000-3v3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-battery-half" fill="currentColor" id="battery-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 5H2a1 1 0 00-1 1v4a1 1 0 001 1h10a1 1 0 001-1V6a1 1 0 00-1-1zM2 4a2 2 0 00-2 2v4a2 2 0 002 2h10a2 2 0 002-2V6a2 2 0 00-2-2H2z"/><path d="M2 6h5v4H2V6zm12.5 3.5a1.5 1.5 0 000-3v3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bell" fill="currentColor" id="bell" xmlns="http://www.w3.org/2000/svg"><path d="M8 16a2 2 0 002-2H6a2 2 0 002 2z"/><path fill-rule="evenodd" d="M8 1.918l-.797.161A4.002 4.002 0 004 6c0 .628-.134 2.197-.459 3.742-.16.767-.376 1.566-.663 2.258h10.244c-.287-.692-.502-1.49-.663-2.258C12.134 8.197 12 6.628 12 6a4.002 4.002 0 00-3.203-3.92L8 1.917zM14.22 12c.223.447.481.801.78 1H1c.299-.199.557-.553.78-1C2.68 10.2 3 6.88 3 6c0-2.42 1.72-4.44 4.005-4.901a1 1 0 111.99 0A5.002 5.002 0 0113 6c0 .88.32 4.2 1.22 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bell-fill" fill="currentColor" id="bell-fill" xmlns="http://www.w3.org/2000/svg"><path d="M8 16a2 2 0 002-2H6a2 2 0 002 2zm.995-14.901a1 1 0 10-1.99 0A5.002 5.002 0 003 6c0 1.098-.5 6-2 7h14c-1.5-1-2-5.902-2-7 0-2.42-1.72-4.44-4.005-4.901z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bezier" fill="currentColor" id="bezier" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 10.5A1.5 1.5 0 011.5 9h1A1.5 1.5 0 014 10.5v1A1.5 1.5 0 012.5 13h-1A1.5 1.5 0 010 11.5v-1zm1.5-.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zm10.5.5A1.5 1.5 0 0113.5 9h1a1.5 1.5 0 011.5 1.5v1a1.5 1.5 0 01-1.5 1.5h-1a1.5 1.5 0 01-1.5-1.5v-1zm1.5-.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zM6 4.5A1.5 1.5 0 017.5 3h1A1.5 1.5 0 0110 4.5v1A1.5 1.5 0 018.5 7h-1A1.5 1.5 0 016 5.5v-1zM7.5 4a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1z"/><path d="M6 4.5H1.866a1 1 0 100 1h2.668A6.517 6.517 0 001.814 9H2.5c.123 0 .244.015.358.043a5.517 5.517 0 013.185-3.185A1.503 1.503 0 016 5.5v-1zm3.957 1.358A1.5 1.5 0 0010 5.5v-1h4.134a1 1 0 110 1h-2.668a6.517 6.517 0 012.72 3.5H13.5c-.123 0-.243.015-.358.043a5.517 5.517 0 00-3.185-3.185z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bezier2" fill="currentColor" id="bezier2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 2.5A1.5 1.5 0 012.5 1h1A1.5 1.5 0 015 2.5h4.134a1 1 0 110 1h-2.01c.18.18.34.381.484.605.638.992.892 2.354.892 3.895 0 1.993.257 3.092.713 3.7.356.476.895.721 1.787.784A1.5 1.5 0 0112.5 11h1a1.5 1.5 0 011.5 1.5v1a1.5 1.5 0 01-1.5 1.5h-1a1.5 1.5 0 01-1.5-1.5H6.866a1 1 0 110-1h1.711a2.839 2.839 0 01-.165-.2C7.743 11.407 7.5 10.007 7.5 8c0-1.46-.246-2.597-.733-3.355-.39-.605-.952-1-1.767-1.112A1.5 1.5 0 013.5 5h-1A1.5 1.5 0 011 3.5v-1zM2.5 2a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zm10 10a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bicycle" fill="currentColor" id="bicycle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 4.5a.5.5 0 01.5-.5H6a.5.5 0 010 1v.5h4.14l.386-1.158A.5.5 0 0111 4h1a.5.5 0 010 1h-.64l-.311.935.807 1.29a3 3 0 11-.848.53l-.508-.812-2.076 3.322A.5.5 0 018 10.5H5.959a3 3 0 11-1.815-3.274L5 5.856V5h-.5a.5.5 0 01-.5-.5zm1.5 2.443l-.508.814c.5.444.85 1.054.967 1.743h1.139L5.5 6.943zM8 9.057L9.598 6.5H6.402L8 9.057zM4.937 9.5a1.997 1.997 0 00-.487-.877l-.548.877h1.035zM3.603 8.092A2 2 0 104.937 10.5H3a.5.5 0 01-.424-.765l1.027-1.643zm7.947.53a2 2 0 10.848-.53l1.026 1.643a.5.5 0 11-.848.53L11.55 8.623z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-binoculars" fill="currentColor" id="binoculars" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 2.5A1.5 1.5 0 014.5 1h1A1.5 1.5 0 017 2.5V5h2V2.5A1.5 1.5 0 0110.5 1h1A1.5 1.5 0 0113 2.5v2.382a.5.5 0 00.276.447l.895.447A1.5 1.5 0 0115 7.118V14.5a1.5 1.5 0 01-1.5 1.5h-3A1.5 1.5 0 019 14.5v-3a.5.5 0 01.146-.354l.854-.853V9.5a.5.5 0 00-.5-.5h-3a.5.5 0 00-.5.5v.793l.854.853A.5.5 0 017 11.5v3A1.5 1.5 0 015.5 16h-3A1.5 1.5 0 011 14.5V7.118a1.5 1.5 0 01.83-1.342l.894-.447A.5.5 0 003 4.882V2.5zM4.5 2a.5.5 0 00-.5.5V3h2v-.5a.5.5 0 00-.5-.5h-1zM6 4H4v.882a1.5 1.5 0 01-.83 1.342l-.894.447A.5.5 0 002 7.118V13h4v-1.293l-.854-.853A.5.5 0 015 10.5v-1A1.5 1.5 0 016.5 8h3A1.5 1.5 0 0111 9.5v1a.5.5 0 01-.146.354l-.854.853V13h4V7.118a.5.5 0 00-.276-.447l-.895-.447A1.5 1.5 0 0112 4.882V4h-2v1.5a.5.5 0 01-.5.5h-3a.5.5 0 01-.5-.5V4zm4-1h2v-.5a.5.5 0 00-.5-.5h-1a.5.5 0 00-.5.5V3zm4 11h-4v.5a.5.5 0 00.5.5h3a.5.5 0 00.5-.5V14zm-8 0H2v.5a.5.5 0 00.5.5h3a.5.5 0 00.5-.5V14z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-binoculars-fill" fill="currentColor" id="binoculars-fill" xmlns="http://www.w3.org/2000/svg"><path d="M4.5 1A1.5 1.5 0 003 2.5V3h4v-.5A1.5 1.5 0 005.5 1h-1zM7 4v1h2V4h4v.882a.5.5 0 00.276.447l.895.447A1.5 1.5 0 0115 7.118V13H9v-1.5a.5.5 0 01.146-.354l.854-.853V9.5a.5.5 0 00-.5-.5h-3a.5.5 0 00-.5.5v.793l.854.853A.5.5 0 017 11.5V13H1V7.118a1.5 1.5 0 01.83-1.342l.894-.447A.5.5 0 003 4.882V4h4zM1 14v.5A1.5 1.5 0 002.5 16h3A1.5 1.5 0 007 14.5V14H1zm8 0v.5a1.5 1.5 0 001.5 1.5h3a1.5 1.5 0 001.5-1.5V14H9zm4-11H9v-.5A1.5 1.5 0 0110.5 1h1A1.5 1.5 0 0113 2.5V3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-blockquote-left" fill="currentColor" id="blockquote-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 3.5a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm5 3a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm-5 3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/><path d="M3.734 6.352a6.586 6.586 0 00-.445.275 1.94 1.94 0 00-.346.299 1.38 1.38 0 00-.252.369c-.058.129-.1.295-.123.498h.282c.242 0 .431.06.568.182.14.117.21.29.21.521a.697.697 0 01-.187.463c-.12.14-.289.21-.503.21-.336 0-.577-.108-.721-.327C2.072 8.619 2 8.328 2 7.969c0-.254.055-.485.164-.692.11-.21.242-.398.398-.562.16-.168.33-.31.51-.428.18-.117.33-.213.451-.287l.211.352zm2.168 0a6.588 6.588 0 00-.445.275 1.94 1.94 0 00-.346.299c-.113.12-.199.246-.257.375a1.75 1.75 0 00-.118.492h.282c.242 0 .431.06.568.182.14.117.21.29.21.521a.697.697 0 01-.187.463c-.12.14-.289.21-.504.21-.335 0-.576-.108-.72-.327-.145-.223-.217-.514-.217-.873 0-.254.055-.485.164-.692.11-.21.242-.398.398-.562.16-.168.33-.31.51-.428.18-.117.33-.213.451-.287l.211.352z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-blockquote-right" fill="currentColor" id="blockquote-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 3.5a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/><path d="M12.168 6.352c.184.105.332.197.445.275.114.074.229.174.346.299.11.117.193.24.252.369s.1.295.123.498h-.281c-.243 0-.432.06-.569.182-.14.117-.21.29-.21.521 0 .164.062.318.187.463.121.14.289.21.504.21.336 0 .576-.108.72-.327.145-.223.217-.514.217-.873 0-.254-.054-.485-.164-.692a2.436 2.436 0 00-.398-.562c-.16-.168-.33-.31-.51-.428-.18-.117-.33-.213-.451-.287l-.211.352zm-2.168 0c.184.105.332.197.445.275.114.074.229.174.346.299.113.12.2.246.258.375.055.125.094.289.117.492h-.281c-.242 0-.432.06-.569.182-.14.117-.21.29-.21.521 0 .164.062.318.187.463.121.14.289.21.504.21.336 0 .576-.108.72-.327.145-.223.217-.514.217-.873 0-.254-.054-.485-.164-.692a2.438 2.438 0 00-.398-.562c-.16-.168-.33-.31-.51-.428-.18-.117-.33-.213-.451-.287L10 6.352z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-book" fill="currentColor" id="book" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 2.828v9.923c.918-.35 2.107-.692 3.287-.81 1.094-.111 2.278-.039 3.213.492V2.687c-.654-.689-1.782-.886-3.112-.752-1.234.124-2.503.523-3.388.893zm7.5-.141v9.746c.935-.53 2.12-.603 3.213-.493 1.18.12 2.37.461 3.287.811V2.828c-.885-.37-2.154-.769-3.388-.893-1.33-.134-2.458.063-3.112.752zM8 1.783C7.015.936 5.587.81 4.287.94c-1.514.153-3.042.672-3.994 1.105A.5.5 0 000 2.5v11a.5.5 0 00.707.455c.882-.4 2.303-.881 3.68-1.02 1.409-.142 2.59.087 3.223.877a.5.5 0 00.78 0c.633-.79 1.814-1.019 3.222-.877 1.378.139 2.8.62 3.681 1.02A.5.5 0 0016 13.5v-11a.5.5 0 00-.293-.455c-.952-.433-2.48-.952-3.994-1.105C10.413.809 8.985.936 8 1.783z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-book-fill" fill="currentColor" id="book-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1.783C7.015.936 5.587.81 4.287.94c-1.514.153-3.042.672-3.994 1.105A.5.5 0 000 2.5v11a.5.5 0 00.707.455c.882-.4 2.303-.881 3.68-1.02 1.409-.142 2.59.087 3.223.877a.5.5 0 00.78 0c.633-.79 1.814-1.019 3.222-.877 1.378.139 2.8.62 3.681 1.02A.5.5 0 0016 13.5v-11a.5.5 0 00-.293-.455c-.952-.433-2.48-.952-3.994-1.105C10.413.809 8.985.936 8 1.783z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-book-half" fill="currentColor" id="book-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.5 2.687v9.746c.935-.53 2.12-.603 3.213-.493 1.18.12 2.37.461 3.287.811V2.828c-.885-.37-2.154-.769-3.388-.893-1.33-.134-2.458.063-3.112.752zM8 1.783C7.015.936 5.587.81 4.287.94c-1.514.153-3.042.672-3.994 1.105A.5.5 0 000 2.5v11a.5.5 0 00.707.455c.882-.4 2.303-.881 3.68-1.02 1.409-.142 2.59.087 3.223.877a.5.5 0 00.78 0c.633-.79 1.814-1.019 3.222-.877 1.378.139 2.8.62 3.681 1.02A.5.5 0 0016 13.5v-11a.5.5 0 00-.293-.455c-.952-.433-2.48-.952-3.994-1.105C10.413.809 8.985.936 8 1.783z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark" fill="currentColor" id="bookmark" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v13.5a.5.5 0 01-.777.416L8 13.101l-5.223 2.815A.5.5 0 012 15.5V2zm2-1a1 1 0 00-1 1v12.566l4.723-2.482a.5.5 0 01.554 0L13 14.566V2a1 1 0 00-1-1H4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-check" fill="currentColor" id="bookmark-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v13.5a.5.5 0 01-.777.416L8 13.101l-5.223 2.815A.5.5 0 012 15.5V2zm2-1a1 1 0 00-1 1v12.566l4.723-2.482a.5.5 0 01.554 0L13 14.566V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M10.854 5.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 11.708-.708L7.5 7.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-check-fill" fill="currentColor" id="bookmark-check-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0a2 2 0 00-2 2v13.5a.5.5 0 00.74.439L8 13.069l5.26 2.87A.5.5 0 0014 15.5V2a2 2 0 00-2-2H4zm6.854 5.854a.5.5 0 00-.708-.708L7.5 7.793 6.354 6.646a.5.5 0 10-.708.708l1.5 1.5a.5.5 0 00.708 0l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-dash" fill="currentColor" id="bookmark-dash" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v13.5a.5.5 0 01-.777.416L8 13.101l-5.223 2.815A.5.5 0 012 15.5V2zm2-1a1 1 0 00-1 1v12.566l4.723-2.482a.5.5 0 01.554 0L13 14.566V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M5.5 6.5A.5.5 0 016 6h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-dash-fill" fill="currentColor" id="bookmark-dash-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0a2 2 0 00-2 2v13.5a.5.5 0 00.74.439L8 13.069l5.26 2.87A.5.5 0 0014 15.5V2a2 2 0 00-2-2H4zm2 6a.5.5 0 000 1h4a.5.5 0 000-1H6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-fill" fill="currentColor" id="bookmark-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v13.5a.5.5 0 01-.74.439L8 13.069l-5.26 2.87A.5.5 0 012 15.5V2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-heart" fill="currentColor" id="bookmark-heart" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v13.5a.5.5 0 01-.777.416L8 13.101l-5.223 2.815A.5.5 0 012 15.5V2zm2-1a1 1 0 00-1 1v12.566l4.723-2.482a.5.5 0 01.554 0L13 14.566V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M8 4.41c1.387-1.425 4.854 1.07 0 4.277C3.146 5.48 6.613 2.986 8 4.412z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-heart-fill" fill="currentColor" id="bookmark-heart-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0a2 2 0 00-2 2v13.5a.5.5 0 00.74.439L8 13.069l5.26 2.87A.5.5 0 0014 15.5V2a2 2 0 00-2-2H4zm4 4.41c1.387-1.425 4.854 1.07 0 4.277C3.146 5.48 6.613 2.986 8 4.412z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-plus" fill="currentColor" id="bookmark-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v13.5a.5.5 0 01-.777.416L8 13.101l-5.223 2.815A.5.5 0 012 15.5V2zm2-1a1 1 0 00-1 1v12.566l4.723-2.482a.5.5 0 01.554 0L13 14.566V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M8 4a.5.5 0 01.5.5V6H10a.5.5 0 010 1H8.5v1.5a.5.5 0 01-1 0V7H6a.5.5 0 010-1h1.5V4.5A.5.5 0 018 4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-plus-fill" fill="currentColor" id="bookmark-plus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0a2 2 0 00-2 2v13.5a.5.5 0 00.74.439L8 13.069l5.26 2.87A.5.5 0 0014 15.5V2a2 2 0 00-2-2H4zm4.5 4.5a.5.5 0 00-1 0V6H6a.5.5 0 000 1h1.5v1.5a.5.5 0 001 0V7H10a.5.5 0 000-1H8.5V4.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-star" fill="currentColor" id="bookmark-star" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v13.5a.5.5 0 01-.777.416L8 13.101l-5.223 2.815A.5.5 0 012 15.5V2zm2-1a1 1 0 00-1 1v12.566l4.723-2.482a.5.5 0 01.554 0L13 14.566V2a1 1 0 00-1-1H4z"/><path d="M7.84 4.1a.178.178 0 01.32 0l.634 1.285a.178.178 0 00.134.098l1.42.206c.145.021.204.2.098.303L9.42 6.993a.178.178 0 00-.051.158l.242 1.414a.178.178 0 01-.258.187l-1.27-.668a.178.178 0 00-.165 0l-1.27.668a.178.178 0 01-.257-.187l.242-1.414a.178.178 0 00-.05-.158l-1.03-1.001a.178.178 0 01.098-.303l1.42-.206a.178.178 0 00.134-.098L7.84 4.1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-star-fill" fill="currentColor" id="bookmark-star-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0a2 2 0 00-2 2v13.5a.5.5 0 00.74.439L8 13.069l5.26 2.87A.5.5 0 0014 15.5V2a2 2 0 00-2-2H4zm4.16 4.1a.178.178 0 00-.32 0l-.634 1.285a.178.178 0 01-.134.098l-1.42.206a.178.178 0 00-.098.303L6.58 6.993c.042.041.061.1.051.158L6.39 8.565a.178.178 0 00.258.187l1.27-.668a.178.178 0 01.165 0l1.27.668a.178.178 0 00.257-.187L9.368 7.15a.178.178 0 01.05-.158l1.028-1.001a.178.178 0 00-.098-.303l-1.42-.206a.178.178 0 01-.134-.098L8.16 4.1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-x" fill="currentColor" id="bookmark-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v13.5a.5.5 0 01-.777.416L8 13.101l-5.223 2.815A.5.5 0 012 15.5V2zm2-1a1 1 0 00-1 1v12.566l4.723-2.482a.5.5 0 01.554 0L13 14.566V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M6.146 5.146a.5.5 0 01.708 0L8 6.293l1.146-1.147a.5.5 0 11.708.708L8.707 7l1.147 1.146a.5.5 0 01-.708.708L8 7.707 6.854 8.854a.5.5 0 11-.708-.708L7.293 7 6.146 5.854a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmark-x-fill" fill="currentColor" id="bookmark-x-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0a2 2 0 00-2 2v13.5a.5.5 0 00.74.439L8 13.069l5.26 2.87A.5.5 0 0014 15.5V2a2 2 0 00-2-2H4zm2.854 5.146a.5.5 0 10-.708.708L7.293 7 6.146 8.146a.5.5 0 10.708.708L8 7.707l1.146 1.147a.5.5 0 10.708-.708L8.707 7l1.147-1.146a.5.5 0 00-.708-.708L8 6.293 6.854 5.146z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmarks" fill="currentColor" id="bookmarks" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 4a2 2 0 012-2h6a2 2 0 012 2v11.5a.5.5 0 01-.777.416L7 13.101l-4.223 2.815A.5.5 0 012 15.5V4zm2-1a1 1 0 00-1 1v10.566l3.723-2.482a.5.5 0 01.554 0L11 14.566V4a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M4.268 1H12a1 1 0 011 1v11.768l.223.148A.5.5 0 0014 13.5V2a2 2 0 00-2-2H6a2 2 0 00-1.732 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookmarks-fill" fill="currentColor" id="bookmarks-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 4a2 2 0 012-2h6a2 2 0 012 2v11.5a.5.5 0 01-.777.416L7 13.101l-4.223 2.815A.5.5 0 012 15.5V4z"/><path fill-rule="evenodd" d="M4.268 1H12a1 1 0 011 1v11.768l.223.148A.5.5 0 0014 13.5V2a2 2 0 00-2-2H6a2 2 0 00-1.732 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bookshelf" fill="currentColor" id="bookshelf" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.5 0a.5.5 0 01.5.5V2h10V.5a.5.5 0 011 0v15a.5.5 0 01-1 0V15H3v.5a.5.5 0 01-1 0V.5a.5.5 0 01.5-.5zM3 14h10v-3H3v3zm0-4h10V7H3v3zm0-4h10V3H3v3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bootstrap" fill="currentColor" id="bootstrap" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 1H4a3 3 0 00-3 3v8a3 3 0 003 3h8a3 3 0 003-3V4a3 3 0 00-3-3zM4 0a4 4 0 00-4 4v8a4 4 0 004 4h8a4 4 0 004-4V4a4 4 0 00-4-4H4z"/><path fill-rule="evenodd" d="M8.537 12H5.062V3.545h3.399c1.587 0 2.543.809 2.543 2.11 0 .884-.65 1.675-1.483 1.816v.1c1.143.117 1.904.931 1.904 2.033 0 1.488-1.084 2.396-2.888 2.396zM6.375 4.658v2.467h1.558c1.16 0 1.764-.428 1.764-1.23 0-.78-.569-1.237-1.541-1.237H6.375zm1.898 6.229H6.375V8.162h1.822c1.236 0 1.887.463 1.887 1.348 0 .896-.627 1.377-1.811 1.377z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bootstrap-fill" fill="currentColor" id="bootstrap-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.002 0a4 4 0 00-4 4v8a4 4 0 004 4h8a4 4 0 004-4V4a4 4 0 00-4-4h-8zm1.06 12h3.475c1.804 0 2.888-.908 2.888-2.396 0-1.102-.761-1.916-1.904-2.034v-.1c.832-.14 1.482-.93 1.482-1.816 0-1.3-.955-2.11-2.542-2.11H5.062V12zm1.313-4.875V4.658h1.78c.973 0 1.542.457 1.542 1.237 0 .802-.604 1.23-1.764 1.23H6.375zm0 3.762h1.898c1.184 0 1.81-.48 1.81-1.377 0-.885-.65-1.348-1.886-1.348H6.375v2.725z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bootstrap-reboot" fill="currentColor" id="bootstrap-reboot" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.161 8a6.84 6.84 0 106.842-6.84.58.58 0 010-1.16 8 8 0 11-6.556 3.412l-.663-.577a.58.58 0 01.227-.997l2.52-.69a.58.58 0 01.728.633l-.332 2.592a.58.58 0 01-.956.364l-.643-.56A6.812 6.812 0 001.16 8zm5.48-.079V5.277h1.57c.881 0 1.416.499 1.416 1.32 0 .84-.504 1.324-1.386 1.324h-1.6zm0 3.75V8.843h1.57l1.498 2.828h1.314L9.377 8.665c.897-.3 1.427-1.106 1.427-2.1 0-1.37-.943-2.246-2.456-2.246H5.5v7.352h1.141z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-border-style" fill="currentColor" id="border-style" xmlns="http://www.w3.org/2000/svg"><path d="M1 3.5a.5.5 0 01.5-.5h13a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-13a.5.5 0 01-.5-.5v-1zm0 4a.5.5 0 01.5-.5h5a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-5a.5.5 0 01-.5-.5v-1zm0 4a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm8 0a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm-4 0a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm8 0a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm-4-4a.5.5 0 01.5-.5h5a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-5a.5.5 0 01-.5-.5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-border-width" fill="currentColor" id="border-width" xmlns="http://www.w3.org/2000/svg"><path d="M0 3.5A.5.5 0 01.5 3h15a.5.5 0 01.5.5v2a.5.5 0 01-.5.5H.5a.5.5 0 01-.5-.5v-2zm0 5A.5.5 0 01.5 8h15a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H.5a.5.5 0 01-.5-.5v-1zm0 4a.5.5 0 01.5-.5h15a.5.5 0 010 1H.5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bounding-box" fill="currentColor" id="bounding-box" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 2V0H0v5h2v6H0v5h5v-2h6v2h5v-5h-2V5h2V0h-5v2H5zm6 1H5v2H3v6h2v2h6v-2h2V5h-2V3zm1-2v3h3V1h-3zm3 11h-3v3h3v-3zM4 15v-3H1v3h3zM1 4h3V1H1v3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bounding-box-circles" fill="currentColor" id="bounding-box-circles" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 1a1 1 0 100 2 1 1 0 000-2zM0 2a2 2 0 013.937-.5h8.126A2 2 0 1114.5 3.937v8.126a2 2 0 11-2.437 2.437H3.937A2 2 0 111.5 12.063V3.937A2 2 0 010 2zm2.5 1.937v8.126c.703.18 1.256.734 1.437 1.437h8.126a2.004 2.004 0 011.437-1.437V3.937A2.004 2.004 0 0112.063 2.5H3.937A2.004 2.004 0 012.5 3.937zM14 1a1 1 0 100 2 1 1 0 000-2zM2 13a1 1 0 100 2 1 1 0 000-2zm12 0a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box" fill="currentColor" id="box" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.186 1.113a.5.5 0 00-.372 0L1.846 3.5 8 5.961 14.154 3.5 8.186 1.113zM15 4.239l-6.5 2.6v7.922l6.5-2.6V4.24zM7.5 14.762V6.838L1 4.239v7.923l6.5 2.6zM7.443.184a1.5 1.5 0 011.114 0l7.129 2.852A.5.5 0 0116 3.5v8.662a1 1 0 01-.629.928l-7.185 2.874a.5.5 0 01-.372 0L.63 13.09a1 1 0 01-.63-.928V3.5a.5.5 0 01.314-.464L7.443.184z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-down" fill="currentColor" id="box-arrow-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 10a.5.5 0 01-.5-.5v-8a.5.5 0 01.5-.5h9a.5.5 0 01.5.5v8a.5.5 0 01-.5.5h-2a.5.5 0 000 1h2A1.5 1.5 0 0014 9.5v-8A1.5 1.5 0 0012.5 0h-9A1.5 1.5 0 002 1.5v8A1.5 1.5 0 003.5 11h2a.5.5 0 000-1h-2z"/><path fill-rule="evenodd" d="M7.646 15.854a.5.5 0 00.708 0l3-3a.5.5 0 00-.708-.708L8.5 14.293V5.5a.5.5 0 00-1 0v8.793l-2.146-2.147a.5.5 0 00-.708.708l3 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-down-left" fill="currentColor" id="box-arrow-down-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.364 12.5a.5.5 0 00.5.5H14.5a1.5 1.5 0 001.5-1.5v-10A1.5 1.5 0 0014.5 0h-10A1.5 1.5 0 003 1.5v6.636a.5.5 0 101 0V1.5a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v10a.5.5 0 01-.5.5H7.864a.5.5 0 00-.5.5z"/><path fill-rule="evenodd" d="M0 15.5a.5.5 0 00.5.5h5a.5.5 0 000-1H1.707l8.147-8.146a.5.5 0 00-.708-.708L1 14.293V10.5a.5.5 0 00-1 0v5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-down-right" fill="currentColor" id="box-arrow-down-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.636 12.5a.5.5 0 01-.5.5H1.5A1.5 1.5 0 010 11.5v-10A1.5 1.5 0 011.5 0h10A1.5 1.5 0 0113 1.5v6.636a.5.5 0 01-1 0V1.5a.5.5 0 00-.5-.5h-10a.5.5 0 00-.5.5v10a.5.5 0 00.5.5h6.636a.5.5 0 01.5.5z"/><path fill-rule="evenodd" d="M16 15.5a.5.5 0 01-.5.5h-5a.5.5 0 010-1h3.793L6.146 6.854a.5.5 0 11.708-.708L15 14.293V10.5a.5.5 0 011 0v5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-in-down" fill="currentColor" id="box-arrow-in-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 6a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h9a.5.5 0 00.5-.5v-8a.5.5 0 00-.5-.5h-2a.5.5 0 010-1h2A1.5 1.5 0 0114 6.5v8a1.5 1.5 0 01-1.5 1.5h-9A1.5 1.5 0 012 14.5v-8A1.5 1.5 0 013.5 5h2a.5.5 0 010 1h-2z"/><path fill-rule="evenodd" d="M7.646 11.854a.5.5 0 00.708 0l3-3a.5.5 0 00-.708-.708L8.5 10.293V1.5a.5.5 0 00-1 0v8.793L5.354 8.146a.5.5 0 10-.708.708l3 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-in-down-left" fill="currentColor" id="box-arrow-in-down-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.636 2.5a.5.5 0 00-.5-.5H2.5A1.5 1.5 0 001 3.5v10A1.5 1.5 0 002.5 15h10a1.5 1.5 0 001.5-1.5V6.864a.5.5 0 00-1 0V13.5a.5.5 0 01-.5.5h-10a.5.5 0 01-.5-.5v-10a.5.5 0 01.5-.5h6.636a.5.5 0 00.5-.5z"/><path fill-rule="evenodd" d="M5 10.5a.5.5 0 00.5.5h5a.5.5 0 000-1H6.707l8.147-8.146a.5.5 0 00-.708-.708L6 9.293V5.5a.5.5 0 00-1 0v5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-in-down-right" fill="currentColor" id="box-arrow-in-down-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.364 2.5a.5.5 0 01.5-.5H13.5A1.5 1.5 0 0115 3.5v10a1.5 1.5 0 01-1.5 1.5h-10A1.5 1.5 0 012 13.5V6.864a.5.5 0 111 0V13.5a.5.5 0 00.5.5h10a.5.5 0 00.5-.5v-10a.5.5 0 00-.5-.5H6.864a.5.5 0 01-.5-.5z"/><path fill-rule="evenodd" d="M11 10.5a.5.5 0 01-.5.5h-5a.5.5 0 010-1h3.793L1.146 1.854a.5.5 0 11.708-.708L10 9.293V5.5a.5.5 0 011 0v5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-in-left" fill="currentColor" id="box-arrow-in-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 3.5a.5.5 0 00-.5-.5h-8a.5.5 0 00-.5.5v9a.5.5 0 00.5.5h8a.5.5 0 00.5-.5v-2a.5.5 0 011 0v2A1.5 1.5 0 019.5 14h-8A1.5 1.5 0 010 12.5v-9A1.5 1.5 0 011.5 2h8A1.5 1.5 0 0111 3.5v2a.5.5 0 01-1 0v-2z"/><path fill-rule="evenodd" d="M4.146 8.354a.5.5 0 010-.708l3-3a.5.5 0 11.708.708L5.707 7.5H14.5a.5.5 0 010 1H5.707l2.147 2.146a.5.5 0 01-.708.708l-3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-in-right" fill="currentColor" id="box-arrow-in-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 3.5a.5.5 0 01.5-.5h8a.5.5 0 01.5.5v9a.5.5 0 01-.5.5h-8a.5.5 0 01-.5-.5v-2a.5.5 0 00-1 0v2A1.5 1.5 0 006.5 14h8a1.5 1.5 0 001.5-1.5v-9A1.5 1.5 0 0014.5 2h-8A1.5 1.5 0 005 3.5v2a.5.5 0 001 0v-2z"/><path fill-rule="evenodd" d="M11.854 8.354a.5.5 0 000-.708l-3-3a.5.5 0 10-.708.708L10.293 7.5H1.5a.5.5 0 000 1h8.793l-2.147 2.146a.5.5 0 00.708.708l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-in-up" fill="currentColor" id="box-arrow-in-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 10a.5.5 0 01-.5-.5v-8a.5.5 0 01.5-.5h9a.5.5 0 01.5.5v8a.5.5 0 01-.5.5h-2a.5.5 0 000 1h2A1.5 1.5 0 0014 9.5v-8A1.5 1.5 0 0012.5 0h-9A1.5 1.5 0 002 1.5v8A1.5 1.5 0 003.5 11h2a.5.5 0 000-1h-2z"/><path fill-rule="evenodd" d="M7.646 4.146a.5.5 0 01.708 0l3 3a.5.5 0 01-.708.708L8.5 5.707V14.5a.5.5 0 01-1 0V5.707L5.354 7.854a.5.5 0 11-.708-.708l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-in-up-left" fill="currentColor" id="box-arrow-in-up-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.636 13.5a.5.5 0 01-.5.5H2.5A1.5 1.5 0 011 12.5v-10A1.5 1.5 0 012.5 1h10A1.5 1.5 0 0114 2.5v6.636a.5.5 0 01-1 0V2.5a.5.5 0 00-.5-.5h-10a.5.5 0 00-.5.5v10a.5.5 0 00.5.5h6.636a.5.5 0 01.5.5z"/><path fill-rule="evenodd" d="M5 5.5a.5.5 0 01.5-.5h5a.5.5 0 010 1H6.707l8.147 8.146a.5.5 0 01-.708.708L6 6.707V10.5a.5.5 0 01-1 0v-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-in-up-right" fill="currentColor" id="box-arrow-in-up-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.364 13.5a.5.5 0 00.5.5H13.5a1.5 1.5 0 001.5-1.5v-10A1.5 1.5 0 0013.5 1h-10A1.5 1.5 0 002 2.5v6.636a.5.5 0 101 0V2.5a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v10a.5.5 0 01-.5.5H6.864a.5.5 0 00-.5.5z"/><path fill-rule="evenodd" d="M11 5.5a.5.5 0 00-.5-.5h-5a.5.5 0 000 1h3.793l-8.147 8.146a.5.5 0 00.708.708L10 6.707V10.5a.5.5 0 001 0v-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-left" fill="currentColor" id="box-arrow-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 12.5a.5.5 0 00.5.5h8a.5.5 0 00.5-.5v-9a.5.5 0 00-.5-.5h-8a.5.5 0 00-.5.5v2a.5.5 0 01-1 0v-2A1.5 1.5 0 016.5 2h8A1.5 1.5 0 0116 3.5v9a1.5 1.5 0 01-1.5 1.5h-8A1.5 1.5 0 015 12.5v-2a.5.5 0 011 0v2z"/><path fill-rule="evenodd" d="M.146 8.354a.5.5 0 010-.708l3-3a.5.5 0 11.708.708L1.707 7.5H10.5a.5.5 0 010 1H1.707l2.147 2.146a.5.5 0 01-.708.708l-3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-right" fill="currentColor" id="box-arrow-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 12.5a.5.5 0 01-.5.5h-8a.5.5 0 01-.5-.5v-9a.5.5 0 01.5-.5h8a.5.5 0 01.5.5v2a.5.5 0 001 0v-2A1.5 1.5 0 009.5 2h-8A1.5 1.5 0 000 3.5v9A1.5 1.5 0 001.5 14h8a1.5 1.5 0 001.5-1.5v-2a.5.5 0 00-1 0v2z"/><path fill-rule="evenodd" d="M15.854 8.354a.5.5 0 000-.708l-3-3a.5.5 0 00-.708.708L14.293 7.5H5.5a.5.5 0 000 1h8.793l-2.147 2.146a.5.5 0 00.708.708l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-up" fill="currentColor" id="box-arrow-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 6a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h9a.5.5 0 00.5-.5v-8a.5.5 0 00-.5-.5h-2a.5.5 0 010-1h2A1.5 1.5 0 0114 6.5v8a1.5 1.5 0 01-1.5 1.5h-9A1.5 1.5 0 012 14.5v-8A1.5 1.5 0 013.5 5h2a.5.5 0 010 1h-2z"/><path fill-rule="evenodd" d="M7.646.146a.5.5 0 01.708 0l3 3a.5.5 0 01-.708.708L8.5 1.707V10.5a.5.5 0 01-1 0V1.707L5.354 3.854a.5.5 0 11-.708-.708l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-up-left" fill="currentColor" id="box-arrow-up-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.364 3.5a.5.5 0 01.5-.5H14.5A1.5 1.5 0 0116 4.5v10a1.5 1.5 0 01-1.5 1.5h-10A1.5 1.5 0 013 14.5V7.864a.5.5 0 111 0V14.5a.5.5 0 00.5.5h10a.5.5 0 00.5-.5v-10a.5.5 0 00-.5-.5H7.864a.5.5 0 01-.5-.5z"/><path fill-rule="evenodd" d="M0 .5A.5.5 0 01.5 0h5a.5.5 0 010 1H1.707l8.147 8.146a.5.5 0 01-.708.708L1 1.707V5.5a.5.5 0 01-1 0v-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-arrow-up-right" fill="currentColor" id="box-arrow-up-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.636 3.5a.5.5 0 00-.5-.5H1.5A1.5 1.5 0 000 4.5v10A1.5 1.5 0 001.5 16h10a1.5 1.5 0 001.5-1.5V7.864a.5.5 0 00-1 0V14.5a.5.5 0 01-.5.5h-10a.5.5 0 01-.5-.5v-10a.5.5 0 01.5-.5h6.636a.5.5 0 00.5-.5z"/><path fill-rule="evenodd" d="M16 .5a.5.5 0 00-.5-.5h-5a.5.5 0 000 1h3.793L6.146 9.146a.5.5 0 10.708.708L15 1.707V5.5a.5.5 0 001 0v-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-box-seam" fill="currentColor" id="box-seam" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.186 1.113a.5.5 0 00-.372 0L1.846 3.5l2.404.961L10.404 2l-2.218-.887zm3.564 1.426L5.596 5 8 5.961 14.154 3.5l-2.404-.961zm3.25 1.7l-6.5 2.6v7.922l6.5-2.6V4.24zM7.5 14.762V6.838L1 4.239v7.923l6.5 2.6zM7.443.184a1.5 1.5 0 011.114 0l7.129 2.852A.5.5 0 0116 3.5v8.662a1 1 0 01-.629.928l-7.185 2.874a.5.5 0 01-.372 0L.63 13.09a1 1 0 01-.63-.928V3.5a.5.5 0 01.314-.464L7.443.184z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-braces" fill="currentColor" id="braces" xmlns="http://www.w3.org/2000/svg"><path d="M2.114 8.063V7.9c1.005-.102 1.497-.615 1.497-1.6V4.503c0-1.094.39-1.538 1.354-1.538h.273V2h-.376C3.25 2 2.49 2.759 2.49 4.352v1.524c0 1.094-.376 1.456-1.49 1.456v1.299c1.114 0 1.49.362 1.49 1.456v1.524c0 1.593.759 2.352 2.372 2.352h.376v-.964h-.273c-.964 0-1.354-.444-1.354-1.538V9.663c0-.984-.492-1.497-1.497-1.6zM13.886 7.9v.163c-1.005.103-1.497.616-1.497 1.6v1.798c0 1.094-.39 1.538-1.354 1.538h-.273v.964h.376c1.613 0 2.372-.759 2.372-2.352v-1.524c0-1.094.376-1.456 1.49-1.456V7.332c-1.114 0-1.49-.362-1.49-1.456V4.352C13.51 2.759 12.75 2 11.138 2h-.376v.964h.273c.964 0 1.354.444 1.354 1.538V6.3c0 .984.492 1.497 1.497 1.6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bricks" fill="currentColor" id="bricks" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 .5A.5.5 0 01.5 0h15a.5.5 0 01.5.5v3a.5.5 0 01-.5.5H14v2h1.5a.5.5 0 01.5.5v3a.5.5 0 01-.5.5H14v2h1.5a.5.5 0 01.5.5v3a.5.5 0 01-.5.5H.5a.5.5 0 01-.5-.5v-3a.5.5 0 01.5-.5H2v-2H.5a.5.5 0 01-.5-.5v-3A.5.5 0 01.5 6H2V4H.5a.5.5 0 01-.5-.5v-3zM3 4v2h4.5V4H3zm5.5 0v2H13V4H8.5zM3 10v2h4.5v-2H3zm5.5 0v2H13v-2H8.5zM1 1v2h3.5V1H1zm4.5 0v2H15V1H5.5zM1 7v2h3.5V7H1zm4.5 0v2h5V7h-5zm6 0v2H15V7h-3.5zM1 13v2h3.5v-2H1zm4.5 0v2h5v-2h-5zm6 0v2H15v-2h-3.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-briefcase" fill="currentColor" id="briefcase" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 12.5A1.5 1.5 0 001.5 14h13a1.5 1.5 0 001.5-1.5v-6h-1v6a.5.5 0 01-.5.5h-13a.5.5 0 01-.5-.5v-6H0v6z"/><path fill-rule="evenodd" d="M0 4.5A1.5 1.5 0 011.5 3h13A1.5 1.5 0 0116 4.5v2.384l-7.614 2.03a1.5 1.5 0 01-.772 0L0 6.884V4.5zM1.5 4a.5.5 0 00-.5.5v1.616l6.871 1.832a.5.5 0 00.258 0L15 6.116V4.5a.5.5 0 00-.5-.5h-13zM5 2.5A1.5 1.5 0 016.5 1h3A1.5 1.5 0 0111 2.5V3h-1v-.5a.5.5 0 00-.5-.5h-3a.5.5 0 00-.5.5V3H5v-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-briefcase-fill" fill="currentColor" id="briefcase-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 12.5A1.5 1.5 0 001.5 14h13a1.5 1.5 0 001.5-1.5V6.85L8.129 8.947a.5.5 0 01-.258 0L0 6.85v5.65z"/><path fill-rule="evenodd" d="M0 4.5A1.5 1.5 0 011.5 3h13A1.5 1.5 0 0116 4.5v1.384l-7.614 2.03a1.5 1.5 0 01-.772 0L0 5.884V4.5zm5-2A1.5 1.5 0 016.5 1h3A1.5 1.5 0 0111 2.5V3h-1v-.5a.5.5 0 00-.5-.5h-3a.5.5 0 00-.5.5V3H5v-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-brightness-alt-high" fill="currentColor" id="brightness-alt-high" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.041 10.5h5.918a3 3 0 00-5.918 0zM4 11a4 4 0 118 0 .5.5 0 01-.5.5h-7A.5.5 0 014 11zm4-8a.5.5 0 01.5.5v2a.5.5 0 01-1 0v-2A.5.5 0 018 3zm8 8a.5.5 0 01-.5.5h-2a.5.5 0 010-1h2a.5.5 0 01.5.5zM3 11a.5.5 0 01-.5.5h-2a.5.5 0 010-1h2a.5.5 0 01.5.5zm10.657-5.657a.5.5 0 010 .707l-1.414 1.414a.5.5 0 11-.707-.707l1.414-1.414a.5.5 0 01.707 0zM4.464 7.464a.5.5 0 01-.707 0L2.343 6.05a.5.5 0 01.707-.707l1.414 1.414a.5.5 0 010 .707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-brightness-alt-high-fill" fill="currentColor" id="brightness-alt-high-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 11a4 4 0 118 0 .5.5 0 01-.5.5h-7A.5.5 0 014 11zm4-8a.5.5 0 01.5.5v2a.5.5 0 01-1 0v-2A.5.5 0 018 3zm8 8a.5.5 0 01-.5.5h-2a.5.5 0 010-1h2a.5.5 0 01.5.5zM3 11a.5.5 0 01-.5.5h-2a.5.5 0 010-1h2a.5.5 0 01.5.5zm10.657-5.657a.5.5 0 010 .707l-1.414 1.414a.5.5 0 11-.707-.707l1.414-1.414a.5.5 0 01.707 0zM4.464 7.464a.5.5 0 01-.707 0L2.343 6.05a.5.5 0 01.707-.707l1.414 1.414a.5.5 0 010 .707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-brightness-alt-low" fill="currentColor" id="brightness-alt-low" xmlns="http://www.w3.org/2000/svg"><path d="M8.5 5.5a.5.5 0 11-1 0 .5.5 0 011 0zm5 6a.5.5 0 110-1 .5.5 0 010 1zm-11 0a.5.5 0 110-1 .5.5 0 010 1zm9.743-4.036a.5.5 0 11-.707-.707.5.5 0 01.707.707zm-8.486 0a.5.5 0 11.707-.707.5.5 0 01-.707.707z"/><path fill-rule="evenodd" d="M5.041 10.5h5.918a3 3 0 00-5.918 0zM4 11a4 4 0 118 0 .5.5 0 01-.5.5h-7A.5.5 0 014 11z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-brightness-alt-low-fill" fill="currentColor" id="brightness-alt-low-fill" xmlns="http://www.w3.org/2000/svg"><path d="M8.5 5.5a.5.5 0 11-1 0 .5.5 0 011 0zm5 6a.5.5 0 110-1 .5.5 0 010 1zm-11 0a.5.5 0 110-1 .5.5 0 010 1zm9.743-4.036a.5.5 0 11-.707-.707.5.5 0 01.707.707zm-8.486 0a.5.5 0 11.707-.707.5.5 0 01-.707.707z"/><path fill-rule="evenodd" d="M4 11a4 4 0 118 0 .5.5 0 01-.5.5h-7A.5.5 0 014 11z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-brightness-high" fill="currentColor" id="brightness-high" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 11a3 3 0 100-6 3 3 0 000 6zm0 1a4 4 0 100-8 4 4 0 000 8zM8 0a.5.5 0 01.5.5v2a.5.5 0 01-1 0v-2A.5.5 0 018 0zm0 13a.5.5 0 01.5.5v2a.5.5 0 01-1 0v-2A.5.5 0 018 13zm8-5a.5.5 0 01-.5.5h-2a.5.5 0 010-1h2a.5.5 0 01.5.5zM3 8a.5.5 0 01-.5.5h-2a.5.5 0 010-1h2A.5.5 0 013 8zm10.657-5.657a.5.5 0 010 .707l-1.414 1.415a.5.5 0 11-.707-.708l1.414-1.414a.5.5 0 01.707 0zm-9.193 9.193a.5.5 0 010 .707L3.05 13.657a.5.5 0 01-.707-.707l1.414-1.414a.5.5 0 01.707 0zm9.193 2.121a.5.5 0 01-.707 0l-1.414-1.414a.5.5 0 01.707-.707l1.414 1.414a.5.5 0 010 .707zM4.464 4.465a.5.5 0 01-.707 0L2.343 3.05a.5.5 0 11.707-.707l1.414 1.414a.5.5 0 010 .708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-brightness-high-fill" fill="currentColor" id="brightness-high-fill" xmlns="http://www.w3.org/2000/svg"><path d="M12 8a4 4 0 11-8 0 4 4 0 018 0z"/><path fill-rule="evenodd" d="M8 0a.5.5 0 01.5.5v2a.5.5 0 01-1 0v-2A.5.5 0 018 0zm0 13a.5.5 0 01.5.5v2a.5.5 0 01-1 0v-2A.5.5 0 018 13zm8-5a.5.5 0 01-.5.5h-2a.5.5 0 010-1h2a.5.5 0 01.5.5zM3 8a.5.5 0 01-.5.5h-2a.5.5 0 010-1h2A.5.5 0 013 8zm10.657-5.657a.5.5 0 010 .707l-1.414 1.415a.5.5 0 11-.707-.708l1.414-1.414a.5.5 0 01.707 0zm-9.193 9.193a.5.5 0 010 .707L3.05 13.657a.5.5 0 01-.707-.707l1.414-1.414a.5.5 0 01.707 0zm9.193 2.121a.5.5 0 01-.707 0l-1.414-1.414a.5.5 0 01.707-.707l1.414 1.414a.5.5 0 010 .707zM4.464 4.465a.5.5 0 01-.707 0L2.343 3.05a.5.5 0 11.707-.707l1.414 1.414a.5.5 0 010 .708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-brightness-low" fill="currentColor" id="brightness-low" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 11a3 3 0 100-6 3 3 0 000 6zm0 1a4 4 0 100-8 4 4 0 000 8z"/><path d="M8.5 2.5a.5.5 0 11-1 0 .5.5 0 011 0zm0 11a.5.5 0 11-1 0 .5.5 0 011 0zm5-5a.5.5 0 110-1 .5.5 0 010 1zm-11 0a.5.5 0 110-1 .5.5 0 010 1zm9.743-4.036a.5.5 0 11-.707-.707.5.5 0 01.707.707zm-7.779 7.779a.5.5 0 11-.707-.707.5.5 0 01.707.707zm7.072 0a.5.5 0 11.707-.707.5.5 0 01-.707.707zM3.757 4.464a.5.5 0 11.707-.707.5.5 0 01-.707.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-brightness-low-fill" fill="currentColor" id="brightness-low-fill" xmlns="http://www.w3.org/2000/svg"><path d="M12 8a4 4 0 11-8 0 4 4 0 018 0zM8.5 2.5a.5.5 0 11-1 0 .5.5 0 011 0zm0 11a.5.5 0 11-1 0 .5.5 0 011 0zm5-5a.5.5 0 110-1 .5.5 0 010 1zm-11 0a.5.5 0 110-1 .5.5 0 010 1zm9.743-4.036a.5.5 0 11-.707-.707.5.5 0 01.707.707zm-7.779 7.779a.5.5 0 11-.707-.707.5.5 0 01.707.707zm7.072 0a.5.5 0 11.707-.707.5.5 0 01-.707.707zM3.757 4.464a.5.5 0 11.707-.707.5.5 0 01-.707.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-broadcast" fill="currentColor" id="broadcast" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.05 3.05a7 7 0 000 9.9.5.5 0 01-.707.707 8 8 0 010-11.314.5.5 0 01.707.707zm2.122 2.122a4 4 0 000 5.656.5.5 0 01-.708.708 5 5 0 010-7.072.5.5 0 01.708.708zm5.656-.708a.5.5 0 01.708 0 5 5 0 010 7.072.5.5 0 11-.708-.708 4 4 0 000-5.656.5.5 0 010-.708zm2.122-2.12a.5.5 0 01.707 0 8 8 0 010 11.313.5.5 0 01-.707-.707 7 7 0 000-9.9.5.5 0 010-.707z"/><path d="M10 8a2 2 0 11-4 0 2 2 0 014 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-broadcast-pin" fill="currentColor" id="broadcast-pin" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.05 3.05a7 7 0 000 9.9.5.5 0 01-.707.707 8 8 0 010-11.314.5.5 0 01.707.707zm2.122 2.122a4 4 0 000 5.656.5.5 0 01-.708.708 5 5 0 010-7.072.5.5 0 01.708.708zm5.656-.708a.5.5 0 01.708 0 5 5 0 010 7.072.5.5 0 11-.708-.708 4 4 0 000-5.656.5.5 0 010-.708zm2.122-2.12a.5.5 0 01.707 0 8 8 0 010 11.313.5.5 0 01-.707-.707 7 7 0 000-9.9.5.5 0 010-.707zM6 8a2 2 0 112.5 1.937V15.5a.5.5 0 01-1 0V9.937A2 2 0 016 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-brush" fill="currentColor" id="brush" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15.825.12a.5.5 0 01.132.584c-1.53 3.43-4.743 8.17-7.095 10.64a6.067 6.067 0 01-2.373 1.534c-.018.227-.06.538-.16.868-.201.659-.667 1.479-1.708 1.74a8.117 8.117 0 01-3.078.132 3.658 3.658 0 01-.563-.135 1.382 1.382 0 01-.465-.247.714.714 0 01-.204-.288.622.622 0 01.004-.443c.095-.245.316-.38.461-.452.393-.197.625-.453.867-.826.094-.144.184-.297.287-.472l.117-.198c.151-.255.326-.54.546-.848.528-.739 1.2-.925 1.746-.896.126.007.243.025.348.048.062-.172.142-.38.238-.608.261-.619.658-1.419 1.187-2.069 2.175-2.67 6.18-6.206 9.117-8.104a.5.5 0 01.596.04zM4.705 11.912a1.23 1.23 0 00-.419-.1c-.247-.013-.574.05-.88.479a11.01 11.01 0 00-.5.777l-.104.177c-.107.181-.213.362-.32.528-.206.317-.438.61-.76.861a7.127 7.127 0 002.657-.12c.559-.139.843-.569.993-1.06a3.121 3.121 0 00.126-.75l-.793-.792zm1.44.026c.12-.04.277-.1.458-.183a5.068 5.068 0 001.535-1.1c1.9-1.996 4.412-5.57 6.052-8.631-2.591 1.927-5.566 4.66-7.302 6.792-.442.543-.796 1.243-1.042 1.826a11.507 11.507 0 00-.276.721l.575.575zm-4.973 3.04l.007-.005a.031.031 0 01-.007.004zm3.582-3.043l.002.001h-.002z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-brush-fill" fill="currentColor" id="brush-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15.825.12a.5.5 0 01.132.584c-1.53 3.43-4.743 8.17-7.095 10.64a6.067 6.067 0 01-2.373 1.534c-.018.227-.06.538-.16.868-.201.659-.667 1.479-1.708 1.74a8.117 8.117 0 01-3.078.132 3.658 3.658 0 01-.563-.135 1.382 1.382 0 01-.465-.247.714.714 0 01-.204-.288.622.622 0 01.004-.443c.095-.245.316-.38.461-.452.393-.197.625-.453.867-.826.094-.144.184-.297.287-.472l.117-.198c.151-.255.326-.54.546-.848.528-.739 1.2-.925 1.746-.896.126.007.243.025.348.048.062-.172.142-.38.238-.608.261-.619.658-1.419 1.187-2.069 2.175-2.67 6.18-6.206 9.117-8.104a.5.5 0 01.596.04z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bucket" fill="currentColor" id="bucket" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.522 5H2a.5.5 0 00-.494.574l1.372 9.149A1.5 1.5 0 004.36 16h7.278a1.5 1.5 0 001.483-1.277l1.373-9.149A.5.5 0 0014 5h-.522A5.5 5.5 0 002.522 5zm1.005 0h8.945a4.5 4.5 0 00-8.945 0zm9.892 1H2.581l1.286 8.574A.5.5 0 004.36 15h7.278a.5.5 0 00.494-.426L13.42 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bucket-fill" fill="currentColor" id="bucket-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.522 5H2a.5.5 0 00-.494.574l1.372 9.149A1.5 1.5 0 004.36 16h7.278a1.5 1.5 0 001.483-1.277l1.373-9.149A.5.5 0 0014 5h-.522A5.5 5.5 0 002.522 5zm1.005 0h8.945a4.5 4.5 0 00-8.945 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bug" fill="currentColor" id="bug" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.355.522a.5.5 0 01.623.333l.291.956A4.979 4.979 0 018 1c1.007 0 1.946.298 2.731.811l.29-.956a.5.5 0 11.957.29l-.41 1.352A4.985 4.985 0 0113 6h.5a.5.5 0 00.5-.5V5a.5.5 0 011 0v.5A1.5 1.5 0 0113.5 7H13v1h1.5a.5.5 0 010 1H13v1h.5a1.5 1.5 0 011.5 1.5v.5a.5.5 0 11-1 0v-.5a.5.5 0 00-.5-.5H13a5 5 0 01-10 0h-.5a.5.5 0 00-.5.5v.5a.5.5 0 11-1 0v-.5A1.5 1.5 0 012.5 10H3V9H1.5a.5.5 0 010-1H3V7h-.5A1.5 1.5 0 011 5.5V5a.5.5 0 011 0v.5a.5.5 0 00.5.5H3c0-1.364.547-2.601 1.432-3.503l-.41-1.352a.5.5 0 01.333-.623zM4 7v4a4 4 0 003.5 3.97V7H4zm4.5 0v7.97A4 4 0 0012 11V7H8.5zM12 6H4a3.99 3.99 0 011.333-2.982A3.983 3.983 0 018 2c1.025 0 1.959.385 2.666 1.018A3.989 3.989 0 0112 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bug-fill" fill="currentColor" id="bug-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.978.855a.5.5 0 10-.956.29l.41 1.352A4.985 4.985 0 003 6h10a4.985 4.985 0 00-1.432-3.503l.41-1.352a.5.5 0 10-.956-.29l-.291.956A4.978 4.978 0 008 1a4.979 4.979 0 00-2.731.811l-.29-.956zM13 6v1H8.5v8.975A5 5 0 0013 11h.5a.5.5 0 01.5.5v.5a.5.5 0 101 0v-.5a1.5 1.5 0 00-1.5-1.5H13V9h1.5a.5.5 0 000-1H13V7h.5A1.5 1.5 0 0015 5.5V5a.5.5 0 00-1 0v.5a.5.5 0 01-.5.5H13zm-5.5 9.975V7H3V6h-.5a.5.5 0 01-.5-.5V5a.5.5 0 00-1 0v.5A1.5 1.5 0 002.5 7H3v1H1.5a.5.5 0 000 1H3v1h-.5A1.5 1.5 0 001 11.5v.5a.5.5 0 101 0v-.5a.5.5 0 01.5-.5H3a5 5 0 004.5 4.975z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-building" fill="currentColor" id="building" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.763.075A.5.5 0 0115 .5v15a.5.5 0 01-.5.5h-3a.5.5 0 01-.5-.5V14h-1v1.5a.5.5 0 01-.5.5h-9a.5.5 0 01-.5-.5V10a.5.5 0 01.342-.474L6 7.64V4.5a.5.5 0 01.276-.447l8-4a.5.5 0 01.487.022zM6 8.694L1 10.36V15h5V8.694zM7 15h2v-1.5a.5.5 0 01.5-.5h2a.5.5 0 01.5.5V15h2V1.309l-7 3.5V15z"/><path d="M2 11h1v1H2v-1zm2 0h1v1H4v-1zm-2 2h1v1H2v-1zm2 0h1v1H4v-1zm4-4h1v1H8V9zm2 0h1v1h-1V9zm-2 2h1v1H8v-1zm2 0h1v1h-1v-1zm2-2h1v1h-1V9zm0 2h1v1h-1v-1zM8 7h1v1H8V7zm2 0h1v1h-1V7zm2 0h1v1h-1V7zM8 5h1v1H8V5zm2 0h1v1h-1V5zm2 0h1v1h-1V5zm0-2h1v1h-1V3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-bullseye" fill="currentColor" id="bullseye" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M8 13A5 5 0 108 3a5 5 0 000 10zm0 1A6 6 0 108 2a6 6 0 000 12z"/><path fill-rule="evenodd" d="M8 11a3 3 0 100-6 3 3 0 000 6zm0 1a4 4 0 100-8 4 4 0 000 8z"/><path d="M9.5 8a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calculator" fill="currentColor" id="calculator" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1zM4 0a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2H4z"/><path d="M4 2.5a.5.5 0 01.5-.5h7a.5.5 0 01.5.5v2a.5.5 0 01-.5.5h-7a.5.5 0 01-.5-.5v-2zm0 4a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm0 3a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm0 3a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm3-6a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm0 3a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm0 3a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm3-6a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm0 3a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v4a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calculator-fill" fill="currentColor" id="calculator-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm2 .5a.5.5 0 01.5-.5h7a.5.5 0 01.5.5v2a.5.5 0 01-.5.5h-7a.5.5 0 01-.5-.5v-2zm0 4a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zM4.5 9a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zM4 12.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zM7.5 6a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zM7 9.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm.5 2.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zM10 6.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm.5 2.5a.5.5 0 00-.5.5v4a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-4a.5.5 0 00-.5-.5h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar" fill="currentColor" id="calendar" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM1 4v10a1 1 0 001 1h12a1 1 0 001-1V4H1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-check" fill="currentColor" id="calendar-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM1 4v10a1 1 0 001 1h12a1 1 0 001-1V4H1z"/><path fill-rule="evenodd" d="M10.854 7.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 11.708-.708L7.5 9.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-check-fill" fill="currentColor" id="calendar-check-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 .5a.5.5 0 00-1 0V1H2a2 2 0 00-2 2v1h16V3a2 2 0 00-2-2h-1V.5a.5.5 0 00-1 0V1H4V.5zM16 14V5H0v9a2 2 0 002 2h12a2 2 0 002-2zm-5.146-5.146a.5.5 0 00-.708-.708L7.5 10.793 6.354 9.646a.5.5 0 10-.708.708l1.5 1.5a.5.5 0 00.708 0l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-date" fill="currentColor" id="calendar-date" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM1 4v10a1 1 0 001 1h12a1 1 0 001-1V4H1z"/><path d="M6.445 11.688V6.354h-.633A12.6 12.6 0 004.5 7.16v.695c.375-.257.969-.62 1.258-.777h.012v4.61h.675zm1.188-1.305c.047.64.594 1.406 1.703 1.406 1.258 0 2-1.066 2-2.871 0-1.934-.781-2.668-1.953-2.668-.926 0-1.797.672-1.797 1.809 0 1.16.824 1.77 1.676 1.77.746 0 1.23-.376 1.383-.79h.027c-.004 1.316-.461 2.164-1.305 2.164-.664 0-1.008-.45-1.05-.82h-.684zm2.953-2.317c0 .696-.559 1.18-1.184 1.18-.601 0-1.144-.383-1.144-1.2 0-.823.582-1.21 1.168-1.21.633 0 1.16.398 1.16 1.23z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-date-fill" fill="currentColor" id="calendar-date-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 .5a.5.5 0 00-1 0V1H2a2 2 0 00-2 2v1h16V3a2 2 0 00-2-2h-1V.5a.5.5 0 00-1 0V1H4V.5zM16 14V5H0v9a2 2 0 002 2h12a2 2 0 002-2zm-6.664-1.21c-1.11 0-1.656-.767-1.703-1.407h.683c.043.37.387.82 1.051.82.844 0 1.301-.848 1.305-2.164h-.027c-.153.414-.637.79-1.383.79-.852 0-1.676-.61-1.676-1.77 0-1.137.871-1.809 1.797-1.809 1.172 0 1.953.734 1.953 2.668 0 1.805-.742 2.871-2 2.871zm.066-2.544c.625 0 1.184-.484 1.184-1.18 0-.832-.527-1.23-1.16-1.23-.586 0-1.168.387-1.168 1.21 0 .817.543 1.2 1.144 1.2zm-2.957-2.89v5.332H5.77v-4.61h-.012c-.29.156-.883.52-1.258.777V8.16a12.6 12.6 0 011.313-.805h.632z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-day" fill="currentColor" id="calendar-day" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM1 4v10a1 1 0 001 1h12a1 1 0 001-1V4H1z"/><path d="M4.684 11.523v-2.3h2.261v-.61H4.684V6.801h2.464v-.61H4v5.332h.684zm3.296 0h.676V8.98c0-.554.227-1.007.953-1.007.125 0 .258.004.329.015v-.613a1.806 1.806 0 00-.254-.02c-.582 0-.891.32-1.012.567h-.02v-.504H7.98v4.105zm2.805-5.093c0 .238.192.425.43.425a.428.428 0 100-.855.426.426 0 00-.43.43zm.094 5.093h.672V7.418h-.672v4.105z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-day-fill" fill="currentColor" id="calendar-day-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 .5a.5.5 0 00-1 0V1H2a2 2 0 00-2 2v1h16V3a2 2 0 00-2-2h-1V.5a.5.5 0 00-1 0V1H4V.5zM16 14V5H0v9a2 2 0 002 2h12a2 2 0 002-2zm-4.785-6.145a.425.425 0 01-.43-.425c0-.242.192-.43.43-.43a.428.428 0 110 .855zm.336.563v4.105h-.672V8.418h.672zm-6.867 4.105v-2.3h2.261v-.61H4.684V7.801h2.464v-.61H4v5.332h.684zm3.296 0h.676V9.98c0-.554.227-1.007.953-1.007.125 0 .258.004.329.015v-.613a1.806 1.806 0 00-.254-.02c-.582 0-.891.32-1.012.567h-.02v-.504H7.98v4.105z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-event" fill="currentColor" id="calendar-event" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM1 4v10a1 1 0 001 1h12a1 1 0 001-1V4H1z"/><path d="M11 6.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-event-fill" fill="currentColor" id="calendar-event-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 .5a.5.5 0 00-1 0V1H2a2 2 0 00-2 2v1h16V3a2 2 0 00-2-2h-1V.5a.5.5 0 00-1 0V1H4V.5zM16 14V5H0v9a2 2 0 002 2h12a2 2 0 002-2zm-3.5-7a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-fill" fill="currentColor" id="calendar-fill" xmlns="http://www.w3.org/2000/svg"><path d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V5h16V4H0V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-minus" fill="currentColor" id="calendar-minus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM1 4v10a1 1 0 001 1h12a1 1 0 001-1V4H1z"/><path fill-rule="evenodd" d="M5.5 9.5A.5.5 0 016 9h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-minus-fill" fill="currentColor" id="calendar-minus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 .5a.5.5 0 00-1 0V1H2a2 2 0 00-2 2v1h16V3a2 2 0 00-2-2h-1V.5a.5.5 0 00-1 0V1H4V.5zM16 14V5H0v9a2 2 0 002 2h12a2 2 0 002-2zM6 10a.5.5 0 000 1h4a.5.5 0 000-1H6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-month" fill="currentColor" id="calendar-month" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM1 4v10a1 1 0 001 1h12a1 1 0 001-1V4H1z"/><path d="M2.56 11.332L3.1 9.73h1.984l.54 1.602h.718L4.444 6h-.696L1.85 11.332h.71zm1.544-4.527L4.9 9.18H3.284l.8-2.375h.02zm5.746.422h-.676V9.77c0 .652-.414 1.023-1.004 1.023-.539 0-.98-.246-.98-1.012V7.227h-.676v2.746c0 .941.606 1.425 1.453 1.425.656 0 1.043-.28 1.188-.605h.027v.539h.668V7.227zm2.258 5.046c-.563 0-.91-.304-.985-.636h-.687c.094.683.625 1.199 1.668 1.199.93 0 1.746-.527 1.746-1.578V7.227h-.649v.578h-.019c-.191-.348-.637-.64-1.195-.64-.965 0-1.64.679-1.64 1.886v.34c0 1.23.683 1.902 1.64 1.902.558 0 1.008-.293 1.172-.648h.02v.605c0 .645-.423 1.023-1.071 1.023zm.008-4.53c.648 0 1.062.527 1.062 1.359v.253c0 .848-.39 1.364-1.062 1.364-.692 0-1.098-.512-1.098-1.364v-.253c0-.868.406-1.36 1.098-1.36z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-month-fill" fill="currentColor" id="calendar-month-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 .5a.5.5 0 00-1 0V1H2a2 2 0 00-2 2v1h16V3a2 2 0 00-2-2h-1V.5a.5.5 0 00-1 0V1H4V.5zM16 14V5H0v9a2 2 0 002 2h12a2 2 0 002-2zM2.56 12.332l.54-1.602h1.984l.54 1.602h.718L4.444 7h-.696L1.85 12.332h.71zm1.544-4.527L4.9 10.18H3.284l.8-2.375h.02zm5.746.422h-.676v2.543c0 .652-.414 1.023-1.004 1.023-.539 0-.98-.246-.98-1.012V8.227h-.676v2.746c0 .941.606 1.425 1.453 1.425.656 0 1.043-.28 1.188-.605h.027v.539h.668V8.227zm1.273 4.41c.075.332.422.636.985.636.648 0 1.07-.378 1.07-1.023v-.605h-.02c-.163.355-.613.648-1.171.648-.957 0-1.64-.672-1.64-1.902v-.34c0-1.207.675-1.887 1.64-1.887.558 0 1.004.293 1.195.64h.02v-.577h.648v4.03c0 1.052-.816 1.579-1.746 1.579-1.043 0-1.574-.516-1.668-1.2h.687zm2.055-2.535c0-.832-.414-1.36-1.062-1.36-.692 0-1.098.492-1.098 1.36v.253c0 .852.406 1.364 1.098 1.364.671 0 1.062-.516 1.062-1.364v-.253z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-plus" fill="currentColor" id="calendar-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM1 4v10a1 1 0 001 1h12a1 1 0 001-1V4H1z"/><path fill-rule="evenodd" d="M8 7a.5.5 0 01.5.5V9H10a.5.5 0 010 1H8.5v1.5a.5.5 0 01-1 0V10H6a.5.5 0 010-1h1.5V7.5A.5.5 0 018 7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-plus-fill" fill="currentColor" id="calendar-plus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 .5a.5.5 0 00-1 0V1H2a2 2 0 00-2 2v1h16V3a2 2 0 00-2-2h-1V.5a.5.5 0 00-1 0V1H4V.5zM16 14V5H0v9a2 2 0 002 2h12a2 2 0 002-2zM8.5 8.5a.5.5 0 00-1 0V10H6a.5.5 0 000 1h1.5v1.5a.5.5 0 001 0V11H10a.5.5 0 000-1H8.5V8.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-range" fill="currentColor" id="calendar-range" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM1 4v10a1 1 0 001 1h12a1 1 0 001-1V4H1z"/><path d="M9 7a1 1 0 011-1h5v2h-5a1 1 0 01-1-1zM1 9h4a1 1 0 010 2H1V9z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-range-fill" fill="currentColor" id="calendar-range-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 .5a.5.5 0 00-1 0V1H2a2 2 0 00-2 2v1h16V3a2 2 0 00-2-2h-1V.5a.5.5 0 00-1 0V1H4V.5zM16 7V5H0v5h5a1 1 0 110 2H0v2a2 2 0 002 2h12a2 2 0 002-2V9h-6a1 1 0 110-2h6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-week" fill="currentColor" id="calendar-week" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM1 4v10a1 1 0 001 1h12a1 1 0 001-1V4H1z"/><path d="M11 6.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm-3 0a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm-5 3a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm3 0a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-week-fill" fill="currentColor" id="calendar-week-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 .5a.5.5 0 00-1 0V1H2a2 2 0 00-2 2v1h16V3a2 2 0 00-2-2h-1V.5a.5.5 0 00-1 0V1H4V.5zM16 14V5H0v9a2 2 0 002 2h12a2 2 0 002-2zM9.5 7a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zm3 0a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zM2 10.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm3.5-.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-x" fill="currentColor" id="calendar-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM1 4v10a1 1 0 001 1h12a1 1 0 001-1V4H1z"/><path fill-rule="evenodd" d="M6.146 7.146a.5.5 0 01.708 0L8 8.293l1.146-1.147a.5.5 0 11.708.708L8.707 9l1.147 1.146a.5.5 0 01-.708.708L8 9.707l-1.146 1.147a.5.5 0 01-.708-.708L7.293 9 6.146 7.854a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar-x-fill" fill="currentColor" id="calendar-x-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 .5a.5.5 0 00-1 0V1H2a2 2 0 00-2 2v1h16V3a2 2 0 00-2-2h-1V.5a.5.5 0 00-1 0V1H4V.5zM16 14V5H0v9a2 2 0 002 2h12a2 2 0 002-2zM6.854 8.146a.5.5 0 10-.708.708L7.293 10l-1.147 1.146a.5.5 0 00.708.708L8 10.707l1.146 1.147a.5.5 0 00.708-.708L8.707 10l1.147-1.146a.5.5 0 00-.708-.708L8 9.293 6.854 8.146z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2" fill="currentColor" id="calendar2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v11a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/><path d="M2.5 4a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-check" fill="currentColor" id="calendar2-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v11a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/><path d="M2.5 4a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V4z"/><path fill-rule="evenodd" d="M10.854 8.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 01.708-.708L7.5 10.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-check-fill" fill="currentColor" id="calendar2-check-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 3.5c0-.276.244-.5.545-.5h10.91c.3 0 .545.224.545.5v1c0 .276-.244.5-.546.5H2.545C2.245 5 2 4.776 2 4.5v-1zm8.854 5.354a.5.5 0 00-.708-.708L7.5 10.793 6.354 9.646a.5.5 0 10-.708.708l1.5 1.5a.5.5 0 00.708 0l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-date" fill="currentColor" id="calendar2-date" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v11a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/><path d="M2.5 4a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V4zm3.945 8.688V7.354h-.633A12.6 12.6 0 004.5 8.16v.695c.375-.257.969-.62 1.258-.777h.012v4.61h.675zm1.188-1.305c.047.64.594 1.406 1.703 1.406 1.258 0 2-1.066 2-2.871 0-1.934-.781-2.668-1.953-2.668-.926 0-1.797.672-1.797 1.809 0 1.16.824 1.77 1.676 1.77.746 0 1.23-.376 1.383-.79h.027c-.004 1.316-.461 2.164-1.305 2.164-.664 0-1.008-.45-1.05-.82h-.684zm2.953-2.317c0 .696-.559 1.18-1.184 1.18-.601 0-1.144-.383-1.144-1.2 0-.823.582-1.21 1.168-1.21.633 0 1.16.398 1.16 1.23z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-date-fill" fill="currentColor" id="calendar2-date-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 3.5c0-.276.244-.5.545-.5h10.91c.3 0 .545.224.545.5v1c0 .276-.244.5-.546.5H2.545C2.245 5 2 4.776 2 4.5v-1zm7.336 9.29c-1.11 0-1.656-.767-1.703-1.407h.683c.043.37.387.82 1.051.82.844 0 1.301-.848 1.305-2.164h-.027c-.153.414-.637.79-1.383.79-.852 0-1.676-.61-1.676-1.77 0-1.137.871-1.809 1.797-1.809 1.172 0 1.953.734 1.953 2.668 0 1.805-.742 2.871-2 2.871zm.066-2.544c.625 0 1.184-.484 1.184-1.18 0-.832-.527-1.23-1.16-1.23-.586 0-1.168.387-1.168 1.21 0 .817.543 1.2 1.144 1.2zm-2.957-2.89v5.332H5.77v-4.61h-.012c-.29.156-.883.52-1.258.777V8.16a12.6 12.6 0 011.313-.805h.632z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-day" fill="currentColor" id="calendar2-day" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v11a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/><path d="M2.5 4a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V4zm2.184 8.523v-2.3h2.261v-.61H4.684V7.801h2.464v-.61H4v5.332h.684zm3.296 0h.676V9.98c0-.554.227-1.007.953-1.007.125 0 .258.004.329.015v-.613a1.806 1.806 0 00-.254-.02c-.582 0-.891.32-1.012.567h-.02v-.504H7.98v4.105zm2.805-5.093c0 .238.192.425.43.425a.428.428 0 100-.855.426.426 0 00-.43.43zm.094 5.093h.672V8.418h-.672v4.105z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-day-fill" fill="currentColor" id="calendar2-day-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 3.5c0-.276.244-.5.545-.5h10.91c.3 0 .545.224.545.5v1c0 .276-.244.5-.546.5H2.545C2.245 5 2 4.776 2 4.5v-1zm9.215 4.355a.425.425 0 01-.43-.425c0-.242.192-.43.43-.43a.428.428 0 110 .855zm.336.563v4.105h-.672V8.418h.672zm-6.867 4.105v-2.3h2.261v-.61H4.684V7.801h2.464v-.61H4v5.332h.684zm3.296 0h.676V9.98c0-.554.227-1.007.953-1.007.125 0 .258.004.329.015v-.613a1.806 1.806 0 00-.254-.02c-.582 0-.891.32-1.012.567h-.02v-.504H7.98v4.105z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-event" fill="currentColor" id="calendar2-event" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v11a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/><path d="M2.5 4a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V4zM11 7.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-event-fill" fill="currentColor" id="calendar2-event-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 3.5c0-.276.244-.5.545-.5h10.91c.3 0 .545.224.545.5v1c0 .276-.244.5-.546.5H2.545C2.245 5 2 4.776 2 4.5v-1zM11.5 7a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-fill" fill="currentColor" id="calendar2-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 .5a.5.5 0 00-1 0V1H2a2 2 0 00-2 2v11a2 2 0 002 2h12a2 2 0 002-2V3a2 2 0 00-2-2h-1V.5a.5.5 0 00-1 0V1H4V.5zM2.545 3c-.3 0-.545.224-.545.5v1c0 .276.244.5.545.5h10.91c.3 0 .545-.224.545-.5v-1c0-.276-.244-.5-.546-.5H2.545z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-minus" fill="currentColor" id="calendar2-minus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v11a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/><path d="M2.5 4a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V4z"/><path fill-rule="evenodd" d="M5.5 10.5A.5.5 0 016 10h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-minus-fill" fill="currentColor" id="calendar2-minus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 3.5c0-.276.244-.5.545-.5h10.91c.3 0 .545.224.545.5v1c0 .276-.244.5-.546.5H2.545C2.245 5 2 4.776 2 4.5v-1zM6 10a.5.5 0 000 1h4a.5.5 0 000-1H6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-month" fill="currentColor" id="calendar2-month" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v11a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/><path d="M2.5 4a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V4zm.06 8.332l.54-1.602h1.984l.54 1.602h.718L4.444 7h-.696L1.85 12.332h.71zm1.544-4.527L4.9 10.18H3.284l.8-2.375h.02zm5.746.422h-.676v2.543c0 .652-.414 1.023-1.004 1.023-.539 0-.98-.246-.98-1.012V8.227h-.676v2.746c0 .941.606 1.425 1.453 1.425.656 0 1.043-.28 1.188-.605h.027v.539h.668V8.227zm2.258 5.046c-.563 0-.91-.304-.985-.636h-.687c.094.683.625 1.199 1.668 1.199.93 0 1.746-.527 1.746-1.578V8.227h-.649v.578h-.019c-.191-.348-.637-.64-1.195-.64-.965 0-1.64.679-1.64 1.886v.34c0 1.23.683 1.902 1.64 1.902.558 0 1.008-.293 1.172-.648h.02v.605c0 .645-.423 1.023-1.071 1.023zm.008-4.53c.648 0 1.062.527 1.062 1.359v.253c0 .848-.39 1.364-1.062 1.364-.692 0-1.098-.512-1.098-1.364v-.253c0-.868.406-1.36 1.098-1.36z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-month-fill" fill="currentColor" id="calendar2-month-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 3.5c0-.276.244-.5.545-.5h10.91c.3 0 .545.224.545.5v1c0 .276-.244.5-.546.5H2.545C2.245 5 2 4.776 2 4.5v-1zm.56 8.832l.54-1.602h1.984l.54 1.602h.718L4.444 7h-.696L1.85 12.332h.71zm1.544-4.527L4.9 10.18H3.284l.8-2.375h.02zm5.746.422h-.676v2.543c0 .652-.414 1.023-1.004 1.023-.539 0-.98-.246-.98-1.012V8.227h-.676v2.746c0 .941.606 1.425 1.453 1.425.656 0 1.043-.28 1.188-.605h.027v.539h.668V8.227zm1.273 4.41c.075.332.422.636.985.636.648 0 1.07-.378 1.07-1.023v-.605h-.02c-.163.355-.613.648-1.171.648-.957 0-1.64-.672-1.64-1.902v-.34c0-1.207.675-1.887 1.64-1.887.558 0 1.004.293 1.195.64h.02v-.577h.648v4.03c0 1.052-.816 1.579-1.746 1.579-1.043 0-1.574-.516-1.668-1.2h.687zm2.055-2.535c0-.832-.414-1.36-1.062-1.36-.692 0-1.098.492-1.098 1.36v.253c0 .852.406 1.364 1.098 1.364.671 0 1.062-.516 1.062-1.364v-.253z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-plus" fill="currentColor" id="calendar2-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v11a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/><path d="M2.5 4a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V4z"/><path fill-rule="evenodd" d="M8 8a.5.5 0 01.5.5V10H10a.5.5 0 010 1H8.5v1.5a.5.5 0 01-1 0V11H6a.5.5 0 010-1h1.5V8.5A.5.5 0 018 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-plus-fill" fill="currentColor" id="calendar2-plus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 3.5c0-.276.244-.5.545-.5h10.91c.3 0 .545.224.545.5v1c0 .276-.244.5-.546.5H2.545C2.245 5 2 4.776 2 4.5v-1zm6.5 5a.5.5 0 00-1 0V10H6a.5.5 0 000 1h1.5v1.5a.5.5 0 001 0V11H10a.5.5 0 000-1H8.5V8.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-range" fill="currentColor" id="calendar2-range" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v11a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/><path d="M2.5 4a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V4zM9 8a1 1 0 011-1h5v2h-5a1 1 0 01-1-1zm-8 2h4a1 1 0 110 2H1v-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-range-fill" fill="currentColor" id="calendar2-range-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 3.5c0-.276.244-.5.545-.5h10.91c.3 0 .545.224.545.5v1c0 .276-.244.5-.546.5H2.545C2.245 5 2 4.776 2 4.5v-1zM10 7a1 1 0 000 2h5V7h-5zm-4 4a1 1 0 00-1-1H1v2h4a1 1 0 001-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-week" fill="currentColor" id="calendar2-week" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v11a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/><path d="M2.5 4a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V4zM11 7.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm-3 0a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm-5 3a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm3 0a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-week-fill" fill="currentColor" id="calendar2-week-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 3.5c0-.276.244-.5.545-.5h10.91c.3 0 .545.224.545.5v1c0 .276-.244.5-.546.5H2.545C2.245 5 2 4.776 2 4.5v-1zM8.5 7a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zm3 0a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zM3 10.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm3.5-.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-x" fill="currentColor" id="calendar2-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v11a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/><path d="M2.5 4a.5.5 0 01.5-.5h10a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V4z"/><path fill-rule="evenodd" d="M6.146 8.146a.5.5 0 01.708 0L8 9.293l1.146-1.147a.5.5 0 11.708.708L8.707 10l1.147 1.146a.5.5 0 01-.708.708L8 10.707l-1.146 1.147a.5.5 0 01-.708-.708L7.293 10 6.146 8.854a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar2-x-fill" fill="currentColor" id="calendar2-x-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 3.5c0-.276.244-.5.545-.5h10.91c.3 0 .545.224.545.5v1c0 .276-.244.5-.546.5H2.545C2.245 5 2 4.776 2 4.5v-1zm4.854 4.646a.5.5 0 10-.708.708L7.293 10l-1.147 1.146a.5.5 0 00.708.708L8 10.707l1.146 1.147a.5.5 0 00.708-.708L8.707 10l1.147-1.146a.5.5 0 00-.708-.708L8 9.293 6.854 8.146z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar3" fill="currentColor" id="calendar3" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 0H2a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2zM1 3.857C1 3.384 1.448 3 2 3h12c.552 0 1 .384 1 .857v10.286c0 .473-.448.857-1 .857H2c-.552 0-1-.384-1-.857V3.857z"/><path fill-rule="evenodd" d="M6.5 7a1 1 0 100-2 1 1 0 000 2zm3 0a1 1 0 100-2 1 1 0 000 2zm3 0a1 1 0 100-2 1 1 0 000 2zm-9 3a1 1 0 100-2 1 1 0 000 2zm3 0a1 1 0 100-2 1 1 0 000 2zm3 0a1 1 0 100-2 1 1 0 000 2zm3 0a1 1 0 100-2 1 1 0 000 2zm-9 3a1 1 0 100-2 1 1 0 000 2zm3 0a1 1 0 100-2 1 1 0 000 2zm3 0a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar3-event" fill="currentColor" id="calendar3-event" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 0H2a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2zM1 3.857C1 3.384 1.448 3 2 3h12c.552 0 1 .384 1 .857v10.286c0 .473-.448.857-1 .857H2c-.552 0-1-.384-1-.857V3.857z"/><path fill-rule="evenodd" d="M12 7a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar3-event-fill" fill="currentColor" id="calendar3-event-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2h16a2 2 0 00-2-2H2zm14 3H0v11a2 2 0 002 2h12a2 2 0 002-2V3zm-2 3a1 1 0 11-2 0 1 1 0 012 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar3-fill" fill="currentColor" id="calendar3-fill" xmlns="http://www.w3.org/2000/svg"><path d="M0 2a2 2 0 012-2h12a2 2 0 012 2H0z"/><path fill-rule="evenodd" d="M0 3h16v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar3-range" fill="currentColor" id="calendar3-range" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 0H2a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2zM1 3.857C1 3.384 1.448 3 2 3h12c.552 0 1 .384 1 .857v10.286c0 .473-.448.857-1 .857H2c-.552 0-1-.384-1-.857V3.857z"/><path fill-rule="evenodd" d="M7 10a1 1 0 000-2H1v2h6zm2-3a1 1 0 010-2h6v2H9z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar3-range-fill" fill="currentColor" id="calendar3-range-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2h16a2 2 0 00-2-2H2zm14 3H0v5h6a1 1 0 010 2H0v4a2 2 0 002 2h12a2 2 0 002-2V7h-6a1 1 0 110-2h6V3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar3-week" fill="currentColor" id="calendar3-week" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 0H2a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2zM1 3.857C1 3.384 1.448 3 2 3h12c.552 0 1 .384 1 .857v10.286c0 .473-.448.857-1 .857H2c-.552 0-1-.384-1-.857V3.857z"/><path fill-rule="evenodd" d="M12 7a1 1 0 100-2 1 1 0 000 2zm-5 3a1 1 0 100-2 1 1 0 000 2zm2-3a1 1 0 100-2 1 1 0 000 2zm-5 3a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar3-week-fill" fill="currentColor" id="calendar3-week-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2h16a2 2 0 00-2-2H2zm14 3H0v11a2 2 0 002 2h12a2 2 0 002-2V3zm-2 3a1 1 0 11-2 0 1 1 0 012 0zM7 9a1 1 0 11-2 0 1 1 0 012 0zm3-2a1 1 0 100-2 1 1 0 000 2zM4 9a1 1 0 11-2 0 1 1 0 012 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar4" fill="currentColor" id="calendar4" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v1h14V3a1 1 0 00-1-1H2zm13 3H1v9a1 1 0 001 1h12a1 1 0 001-1V5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar4-event" fill="currentColor" id="calendar4-event" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v1h14V3a1 1 0 00-1-1H2zm13 3H1v9a1 1 0 001 1h12a1 1 0 001-1V5z"/><rect width="2" height="2" x="11" y="7" rx=".5"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar4-range" fill="currentColor" id="calendar4-range" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v1h14V3a1 1 0 00-1-1H2zm13 3H1v9a1 1 0 001 1h12a1 1 0 001-1V5z"/><path d="M9 7.5a.5.5 0 01.5-.5H15v2H9.5a.5.5 0 01-.5-.5v-1zm-2 3a.5.5 0 00-.5-.5H1v2h5.5a.5.5 0 00.5-.5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-calendar4-week" fill="currentColor" id="calendar4-week" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0a.5.5 0 01.5.5V1h8V.5a.5.5 0 011 0V1h1a2 2 0 012 2v11a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h1V.5a.5.5 0 01.5-.5zM2 2a1 1 0 00-1 1v1h14V3a1 1 0 00-1-1H2zm13 3H1v9a1 1 0 001 1h12a1 1 0 001-1V5z"/><path d="M11 7.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm-3 0a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm-2 3a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1zm-3 0a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-camera" fill="currentColor" id="camera" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15 12V6a1 1 0 00-1-1h-1.172a3 3 0 01-2.12-.879l-.83-.828A1 1 0 009.173 3H6.828a1 1 0 00-.707.293l-.828.828A3 3 0 013.172 5H2a1 1 0 00-1 1v6a1 1 0 001 1h12a1 1 0 001-1zM2 4a2 2 0 00-2 2v6a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1.172a2 2 0 01-1.414-.586l-.828-.828A2 2 0 009.172 2H6.828a2 2 0 00-1.414.586l-.828.828A2 2 0 013.172 4H2z"/><path fill-rule="evenodd" d="M8 11a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm0 1a3.5 3.5 0 100-7 3.5 3.5 0 000 7z"/><path d="M3 6.5a.5.5 0 11-1 0 .5.5 0 011 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-camera-fill" fill="currentColor" id="camera-fill" xmlns="http://www.w3.org/2000/svg"><path d="M10.5 8.5a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z"/><path fill-rule="evenodd" d="M2 4a2 2 0 00-2 2v6a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1.172a2 2 0 01-1.414-.586l-.828-.828A2 2 0 009.172 2H6.828a2 2 0 00-1.414.586l-.828.828A2 2 0 013.172 4H2zm.5 2a.5.5 0 100-1 .5.5 0 000 1zm9 2.5a3.5 3.5 0 11-7 0 3.5 3.5 0 017 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-camera-reels" fill="currentColor" id="camera-reels" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 8a2 2 0 012-2h7.5a2 2 0 011.983 1.738l3.11-1.382A1 1 0 0116 7.269v7.462a1 1 0 01-1.406.913l-3.111-1.382A2 2 0 019.5 16H2a2 2 0 01-2-2V8zm11.5 5.175l3.5 1.556V7.269l-3.5 1.556v4.35zM2 7a1 1 0 00-1 1v6a1 1 0 001 1h7.5a1 1 0 001-1V8a1 1 0 00-1-1H2z"/><path fill-rule="evenodd" d="M3 5a2 2 0 100-4 2 2 0 000 4zm0 1a3 3 0 100-6 3 3 0 000 6z"/><path fill-rule="evenodd" d="M9 5a2 2 0 100-4 2 2 0 000 4zm0 1a3 3 0 100-6 3 3 0 000 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-camera-reels-fill" fill="currentColor" id="camera-reels-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 8a2 2 0 012-2h7.5a2 2 0 011.983 1.738l3.11-1.382A1 1 0 0116 7.269v7.462a1 1 0 01-1.406.913l-3.111-1.382A2 2 0 019.5 16H2a2 2 0 01-2-2V8z"/><circle cx="3" cy="3" r="3"/><circle cx="9" cy="3" r="3"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-camera-video" fill="currentColor" id="camera-video" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 5a2 2 0 012-2h7.5a2 2 0 011.983 1.738l3.11-1.382A1 1 0 0116 4.269v7.462a1 1 0 01-1.406.913l-3.111-1.382A2 2 0 019.5 13H2a2 2 0 01-2-2V5zm11.5 5.175l3.5 1.556V4.269l-3.5 1.556v4.35zM2 4a1 1 0 00-1 1v6a1 1 0 001 1h7.5a1 1 0 001-1V5a1 1 0 00-1-1H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-camera-video-fill" fill="currentColor" id="camera-video-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 5a2 2 0 012-2h7.5a2 2 0 011.983 1.738l3.11-1.382A1 1 0 0116 4.269v7.462a1 1 0 01-1.406.913l-3.111-1.382A2 2 0 019.5 13H2a2 2 0 01-2-2V5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-camera-video-off" fill="currentColor" id="camera-video-off" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.961 12.365a1.99 1.99 0 00.522-1.103l3.11 1.382A1 1 0 0016 11.731V4.269a1 1 0 00-1.406-.913l-3.111 1.382A2 2 0 009.5 3H4.272l.714 1H9.5a1 1 0 011 1v6a1 1 0 01-.144.518l.605.847zM1.428 4.18A.999.999 0 001 5v6a1 1 0 001 1h5.014l.714 1H2a2 2 0 01-2-2V5c0-.675.334-1.272.847-1.634l.58.814zM15 11.73l-3.5-1.555v-4.35L15 4.269v7.462zm-4.407 3.56l-10-14 .814-.58 10 14-.814.58z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-camera-video-off-fill" fill="currentColor" id="camera-video-off-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.961 12.365a1.99 1.99 0 00.522-1.103l3.11 1.382A1 1 0 0016 11.731V4.269a1 1 0 00-1.406-.913l-3.111 1.382A2 2 0 009.5 3H4.272l6.69 9.365zm-10.114-9A2.001 2.001 0 000 5v6a2 2 0 002 2h5.728L.847 3.366zm9.746 11.925l-10-14 .814-.58 10 14-.814.58z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-camera2" fill="currentColor" id="camera2" xmlns="http://www.w3.org/2000/svg"><path d="M9 5C7.343 5 5 6.343 5 8a4 4 0 014-4v1z"/><path fill-rule="evenodd" d="M14.333 3h-2.015A5.97 5.97 0 009 2a5.972 5.972 0 00-3.318 1H1.667C.747 3 0 3.746 0 4.667v6.666C0 12.253.746 13 1.667 13h4.015c.95.632 2.091 1 3.318 1a5.973 5.973 0 003.318-1h2.015c.92 0 1.667-.746 1.667-1.667V4.667C16 3.747 15.254 3 14.333 3zM1.5 5a.5.5 0 100-1 .5.5 0 000 1zM9 13A5 5 0 109 3a5 5 0 000 10z"/><path d="M2 3a1 1 0 011-1h1a1 1 0 010 2H3a1 1 0 01-1-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-capslock" fill="currentColor" id="capslock" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.27 1.047a1 1 0 011.46 0l6.345 6.77c.6.638.146 1.683-.73 1.683H11.5v1a1 1 0 01-1 1h-5a1 1 0 01-1-1v-1H1.654C.78 9.5.326 8.455.924 7.816L7.27 1.047zM14.346 8.5L8 1.731 1.654 8.5H4.5a1 1 0 011 1v1h5v-1a1 1 0 011-1h2.846zm-9.846 5a1 1 0 011-1h5a1 1 0 011 1v1a1 1 0 01-1 1h-5a1 1 0 01-1-1v-1zm6 0h-5v1h5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-capslock-fill" fill="currentColor" id="capslock-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.27 1.047a1 1 0 011.46 0l6.345 6.77c.6.638.146 1.683-.73 1.683H11.5v1a1 1 0 01-1 1h-5a1 1 0 01-1-1v-1H1.654C.78 9.5.326 8.455.924 7.816L7.27 1.047zM4.5 13.5a1 1 0 011-1h5a1 1 0 011 1v1a1 1 0 01-1 1h-5a1 1 0 01-1-1v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-card-checklist" fill="currentColor" id="card-checklist" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.5 3h-13a.5.5 0 00-.5.5v9a.5.5 0 00.5.5h13a.5.5 0 00.5-.5v-9a.5.5 0 00-.5-.5zm-13-1A1.5 1.5 0 000 3.5v9A1.5 1.5 0 001.5 14h13a1.5 1.5 0 001.5-1.5v-9A1.5 1.5 0 0014.5 2h-13z"/><path fill-rule="evenodd" d="M7 5.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm-1.496-.854a.5.5 0 010 .708l-1.5 1.5a.5.5 0 01-.708 0l-.5-.5a.5.5 0 11.708-.708l.146.147 1.146-1.147a.5.5 0 01.708 0zM7 9.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm-1.496-.854a.5.5 0 010 .708l-1.5 1.5a.5.5 0 01-.708 0l-.5-.5a.5.5 0 01.708-.708l.146.147 1.146-1.147a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-card-heading" fill="currentColor" id="card-heading" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.5 3h-13a.5.5 0 00-.5.5v9a.5.5 0 00.5.5h13a.5.5 0 00.5-.5v-9a.5.5 0 00-.5-.5zm-13-1A1.5 1.5 0 000 3.5v9A1.5 1.5 0 001.5 14h13a1.5 1.5 0 001.5-1.5v-9A1.5 1.5 0 0014.5 2h-13z"/><path fill-rule="evenodd" d="M3 8.5a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5z"/><path d="M3 5.5a.5.5 0 01.5-.5h9a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-9a.5.5 0 01-.5-.5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-card-image" fill="currentColor" id="card-image" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.5 3h-13a.5.5 0 00-.5.5v9c0 .013 0 .027.002.04V12l2.646-2.354a.5.5 0 01.63-.062l2.66 1.773 3.71-3.71a.5.5 0 01.577-.094L15 9.499V3.5a.5.5 0 00-.5-.5zm-13-1A1.5 1.5 0 000 3.5v9A1.5 1.5 0 001.5 14h13a1.5 1.5 0 001.5-1.5v-9A1.5 1.5 0 0014.5 2h-13zm4.502 3.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-card-list" fill="currentColor" id="card-list" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.5 3h-13a.5.5 0 00-.5.5v9a.5.5 0 00.5.5h13a.5.5 0 00.5-.5v-9a.5.5 0 00-.5-.5zm-13-1A1.5 1.5 0 000 3.5v9A1.5 1.5 0 001.5 14h13a1.5 1.5 0 001.5-1.5v-9A1.5 1.5 0 0014.5 2h-13z"/><path fill-rule="evenodd" d="M5 8a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7A.5.5 0 015 8zm0-2.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm0 5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5z"/><circle cx="3.5" cy="5.5" r=".5"/><circle cx="3.5" cy="8" r=".5"/><circle cx="3.5" cy="10.5" r=".5"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-card-text" fill="currentColor" id="card-text" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.5 3h-13a.5.5 0 00-.5.5v9a.5.5 0 00.5.5h13a.5.5 0 00.5-.5v-9a.5.5 0 00-.5-.5zm-13-1A1.5 1.5 0 000 3.5v9A1.5 1.5 0 001.5 14h13a1.5 1.5 0 001.5-1.5v-9A1.5 1.5 0 0014.5 2h-13z"/><path fill-rule="evenodd" d="M3 5.5a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zM3 8a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9A.5.5 0 013 8zm0 2.5a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-down" fill="currentColor" id="caret-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.204 5L8 10.481 12.796 5H3.204zm-.753.659l4.796 5.48a1 1 0 001.506 0l4.796-5.48c.566-.647.106-1.659-.753-1.659H3.204a1 1 0 00-.753 1.659z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-down-fill" fill="currentColor" id="caret-down-fill" xmlns="http://www.w3.org/2000/svg"><path d="M7.247 11.14L2.451 5.658C1.885 5.013 2.345 4 3.204 4h9.592a1 1 0 01.753 1.659l-4.796 5.48a1 1 0 01-1.506 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-down-square" fill="currentColor" id="caret-down-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.544 6.295A.5.5 0 014 6h8a.5.5 0 01.374.832l-4 4.5a.5.5 0 01-.748 0l-4-4.5a.5.5 0 01-.082-.537z"/><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-down-square-fill" fill="currentColor" id="caret-down-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v12a2 2 0 01-2 2H2a2 2 0 01-2-2V2zm4 4a.5.5 0 00-.374.832l4 4.5a.5.5 0 00.748 0l4-4.5A.5.5 0 0012 6H4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-left" fill="currentColor" id="caret-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 12.796L4.519 8 10 3.204v9.592zm-.659.753l-5.48-4.796a1 1 0 010-1.506l5.48-4.796A1 1 0 0111 3.204v9.592a1 1 0 01-1.659.753z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-left-fill" fill="currentColor" id="caret-left-fill" xmlns="http://www.w3.org/2000/svg"><path d="M3.86 8.753l5.482 4.796c.646.566 1.658.106 1.658-.753V3.204a1 1 0 00-1.659-.753l-5.48 4.796a1 1 0 000 1.506z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-left-square" fill="currentColor" id="caret-left-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M10.205 12.456A.5.5 0 0010.5 12V4a.5.5 0 00-.832-.374l-4.5 4a.5.5 0 000 .748l4.5 4a.5.5 0 00.537.082z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-left-square-fill" fill="currentColor" id="caret-left-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v12a2 2 0 01-2 2H2a2 2 0 01-2-2V2zm10.5 10a.5.5 0 01-.832.374l-4.5-4a.5.5 0 010-.748l4.5-4A.5.5 0 0110.5 4v8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-right" fill="currentColor" id="caret-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 12.796L11.481 8 6 3.204v9.592zm.659.753l5.48-4.796a1 1 0 000-1.506L6.66 2.451C6.011 1.885 5 2.345 5 3.204v9.592a1 1 0 001.659.753z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-right-fill" fill="currentColor" id="caret-right-fill" xmlns="http://www.w3.org/2000/svg"><path d="M12.14 8.753l-5.482 4.796c-.646.566-1.658.106-1.658-.753V3.204a1 1 0 011.659-.753l5.48 4.796a1 1 0 010 1.506z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-right-square" fill="currentColor" id="caret-right-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M5.795 12.456A.5.5 0 015.5 12V4a.5.5 0 01.832-.374l4.5 4a.5.5 0 010 .748l-4.5 4a.5.5 0 01-.537.082z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-right-square-fill" fill="currentColor" id="caret-right-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v12a2 2 0 01-2 2H2a2 2 0 01-2-2V2zm5.5 10a.5.5 0 00.832.374l4.5-4a.5.5 0 000-.748l-4.5-4A.5.5 0 005.5 4v8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-up" fill="currentColor" id="caret-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.204 11L8 5.519 12.796 11H3.204zm-.753-.659l4.796-5.48a1 1 0 011.506 0l4.796 5.48c.566.647.106 1.659-.753 1.659H3.204a1 1 0 01-.753-1.659z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-up-fill" fill="currentColor" id="caret-up-fill" xmlns="http://www.w3.org/2000/svg"><path d="M7.247 4.86l-4.796 5.481c-.566.647-.106 1.659.753 1.659h9.592a1 1 0 00.753-1.659l-4.796-5.48a1 1 0 00-1.506 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-up-square" fill="currentColor" id="caret-up-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M3.544 10.705A.5.5 0 004 11h8a.5.5 0 00.374-.832l-4-4.5a.5.5 0 00-.748 0l-4 4.5a.5.5 0 00-.082.537z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-caret-up-square-fill" fill="currentColor" id="caret-up-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v12a2 2 0 01-2 2H2a2 2 0 01-2-2V2zm4 9a.5.5 0 01-.374-.832l4-4.5a.5.5 0 01.748 0l4 4.5A.5.5 0 0112 11H4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart" fill="currentColor" id="cart" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A.5.5 0 01.5 1H2a.5.5 0 01.485.379L2.89 3H14.5a.5.5 0 01.491.592l-1.5 8A.5.5 0 0113 12H4a.5.5 0 01-.491-.408L2.01 3.607 1.61 2H.5a.5.5 0 01-.5-.5zM3.102 4l1.313 7h8.17l1.313-7H3.102zM5 12a2 2 0 100 4 2 2 0 000-4zm7 0a2 2 0 100 4 2 2 0 000-4zm-7 1a1 1 0 100 2 1 1 0 000-2zm7 0a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart-check" fill="currentColor" id="cart-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A.5.5 0 01.5 1H2a.5.5 0 01.485.379L2.89 3H14.5a.5.5 0 01.491.592l-1.5 8A.5.5 0 0113 12H4a.5.5 0 01-.491-.408L2.01 3.607 1.61 2H.5a.5.5 0 01-.5-.5zM3.102 4l1.313 7h8.17l1.313-7H3.102zM5 12a2 2 0 100 4 2 2 0 000-4zm7 0a2 2 0 100 4 2 2 0 000-4zm-7 1a1 1 0 100 2 1 1 0 000-2zm7 0a1 1 0 100 2 1 1 0 000-2z"/><path fill-rule="evenodd" d="M11.354 5.646a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 11.708-.708L8 8.293l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart-check-fill" fill="currentColor" id="cart-check-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.5 1a.5.5 0 000 1h1.11l.401 1.607 1.498 7.985A.5.5 0 004 12h1a2 2 0 100 4 2 2 0 000-4h7a2 2 0 100 4 2 2 0 000-4h1a.5.5 0 00.491-.408l1.5-8A.5.5 0 0014.5 3H2.89l-.405-1.621A.5.5 0 002 1H.5zM4 14a1 1 0 112 0 1 1 0 01-2 0zm7 0a1 1 0 112 0 1 1 0 01-2 0zm.354-7.646a.5.5 0 00-.708-.708L8 8.293 6.854 7.146a.5.5 0 10-.708.708l1.5 1.5a.5.5 0 00.708 0l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart-dash" fill="currentColor" id="cart-dash" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A.5.5 0 01.5 1H2a.5.5 0 01.485.379L2.89 3H14.5a.5.5 0 01.491.592l-1.5 8A.5.5 0 0113 12H4a.5.5 0 01-.491-.408L2.01 3.607 1.61 2H.5a.5.5 0 01-.5-.5zM3.102 4l1.313 7h8.17l1.313-7H3.102zM5 12a2 2 0 100 4 2 2 0 000-4zm7 0a2 2 0 100 4 2 2 0 000-4zm-7 1a1 1 0 100 2 1 1 0 000-2zm7 0a1 1 0 100 2 1 1 0 000-2z"/><path fill-rule="evenodd" d="M6 7.5a.5.5 0 01.5-.5h4a.5.5 0 010 1h-4a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart-dash-fill" fill="currentColor" id="cart-dash-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.5 1a.5.5 0 000 1h1.11l.401 1.607 1.498 7.985A.5.5 0 004 12h1a2 2 0 100 4 2 2 0 000-4h7a2 2 0 100 4 2 2 0 000-4h1a.5.5 0 00.491-.408l1.5-8A.5.5 0 0014.5 3H2.89l-.405-1.621A.5.5 0 002 1H.5zM4 14a1 1 0 112 0 1 1 0 01-2 0zm7 0a1 1 0 112 0 1 1 0 01-2 0zM6.5 7a.5.5 0 000 1h4a.5.5 0 000-1h-4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart-fill" fill="currentColor" id="cart-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A.5.5 0 01.5 1H2a.5.5 0 01.485.379L2.89 3H14.5a.5.5 0 01.491.592l-1.5 8A.5.5 0 0113 12H4a.5.5 0 01-.491-.408L2.01 3.607 1.61 2H.5a.5.5 0 01-.5-.5zM5 12a2 2 0 100 4 2 2 0 000-4zm7 0a2 2 0 100 4 2 2 0 000-4zm-7 1a1 1 0 100 2 1 1 0 000-2zm7 0a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart-plus" fill="currentColor" id="cart-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A.5.5 0 01.5 1H2a.5.5 0 01.485.379L2.89 3H14.5a.5.5 0 01.491.592l-1.5 8A.5.5 0 0113 12H4a.5.5 0 01-.491-.408L2.01 3.607 1.61 2H.5a.5.5 0 01-.5-.5zM3.102 4l1.313 7h8.17l1.313-7H3.102zM5 12a2 2 0 100 4 2 2 0 000-4zm7 0a2 2 0 100 4 2 2 0 000-4zm-7 1a1 1 0 100 2 1 1 0 000-2zm7 0a1 1 0 100 2 1 1 0 000-2z"/><path fill-rule="evenodd" d="M8.5 5a.5.5 0 01.5.5V7h1.5a.5.5 0 010 1H9v1.5a.5.5 0 01-1 0V8H6.5a.5.5 0 010-1H8V5.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart-plus-fill" fill="currentColor" id="cart-plus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.5 1a.5.5 0 000 1h1.11l.401 1.607 1.498 7.985A.5.5 0 004 12h1a2 2 0 100 4 2 2 0 000-4h7a2 2 0 100 4 2 2 0 000-4h1a.5.5 0 00.491-.408l1.5-8A.5.5 0 0014.5 3H2.89l-.405-1.621A.5.5 0 002 1H.5zM4 14a1 1 0 112 0 1 1 0 01-2 0zm7 0a1 1 0 112 0 1 1 0 01-2 0zM9 5.5a.5.5 0 00-1 0V7H6.5a.5.5 0 000 1H8v1.5a.5.5 0 001 0V8h1.5a.5.5 0 000-1H9V5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart-x" fill="currentColor" id="cart-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A.5.5 0 01.5 1H2a.5.5 0 01.485.379L2.89 3H14.5a.5.5 0 01.491.592l-1.5 8A.5.5 0 0113 12H4a.5.5 0 01-.491-.408L2.01 3.607 1.61 2H.5a.5.5 0 01-.5-.5zM3.102 4l1.313 7h8.17l1.313-7H3.102zM5 12a2 2 0 100 4 2 2 0 000-4zm7 0a2 2 0 100 4 2 2 0 000-4zm-7 1a1 1 0 100 2 1 1 0 000-2zm7 0a1 1 0 100 2 1 1 0 000-2z"/><path fill-rule="evenodd" d="M6.646 5.646a.5.5 0 01.708 0L8.5 6.793l1.146-1.147a.5.5 0 01.708.708L9.207 7.5l1.147 1.146a.5.5 0 01-.708.708L8.5 8.207 7.354 9.354a.5.5 0 11-.708-.708L7.793 7.5 6.646 6.354a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart-x-fill" fill="currentColor" id="cart-x-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.5 1a.5.5 0 000 1h1.11l.401 1.607 1.498 7.985A.5.5 0 004 12h1a2 2 0 100 4 2 2 0 000-4h7a2 2 0 100 4 2 2 0 000-4h1a.5.5 0 00.491-.408l1.5-8A.5.5 0 0014.5 3H2.89l-.405-1.621A.5.5 0 002 1H.5zM4 14a1 1 0 112 0 1 1 0 01-2 0zm7 0a1 1 0 112 0 1 1 0 01-2 0zM7.354 5.646a.5.5 0 10-.708.708L7.793 7.5 6.646 8.646a.5.5 0 10.708.708L8.5 8.207l1.146 1.147a.5.5 0 00.708-.708L9.207 7.5l1.147-1.146a.5.5 0 00-.708-.708L8.5 6.793 7.354 5.646z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart2" fill="currentColor" id="cart2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2.5A.5.5 0 01.5 2H2a.5.5 0 01.485.379L2.89 4H14.5a.5.5 0 01.485.621l-1.5 6A.5.5 0 0113 11H4a.5.5 0 01-.485-.379L1.61 3H.5a.5.5 0 01-.5-.5zM3.14 5l1.25 5h8.22l1.25-5H3.14zM5 13a1 1 0 100 2 1 1 0 000-2zm-2 1a2 2 0 114 0 2 2 0 01-4 0zm9-1a1 1 0 100 2 1 1 0 000-2zm-2 1a2 2 0 114 0 2 2 0 01-4 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart3" fill="currentColor" id="cart3" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A.5.5 0 01.5 1H2a.5.5 0 01.485.379L2.89 3H14.5a.5.5 0 01.49.598l-1 5a.5.5 0 01-.465.401l-9.397.472L4.415 11H13a.5.5 0 010 1H4a.5.5 0 01-.491-.408L2.01 3.607 1.61 2H.5a.5.5 0 01-.5-.5zM3.102 4l.84 4.479 9.144-.459L13.89 4H3.102zM5 12a2 2 0 100 4 2 2 0 000-4zm7 0a2 2 0 100 4 2 2 0 000-4zm-7 1a1 1 0 100 2 1 1 0 000-2zm7 0a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cart4" fill="currentColor" id="cart4" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2.5A.5.5 0 01.5 2H2a.5.5 0 01.485.379L2.89 4H14.5a.5.5 0 01.485.621l-1.5 6A.5.5 0 0113 11H4a.5.5 0 01-.485-.379L1.61 3H.5a.5.5 0 01-.5-.5zM3.14 5l.5 2H5V5H3.14zM6 5v2h2V5H6zm3 0v2h2V5H9zm3 0v2h1.36l.5-2H12zm1.11 3H12v2h.61l.5-2zM11 8H9v2h2V8zM8 8H6v2h2V8zM5 8H3.89l.5 2H5V8zm0 5a1 1 0 100 2 1 1 0 000-2zm-2 1a2 2 0 114 0 2 2 0 01-4 0zm9-1a1 1 0 100 2 1 1 0 000-2zm-2 1a2 2 0 114 0 2 2 0 01-4 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cash" fill="currentColor" id="cash" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15 4H1v8h14V4zM1 3a1 1 0 00-1 1v8a1 1 0 001 1h14a1 1 0 001-1V4a1 1 0 00-1-1H1z"/><path d="M13 4a2 2 0 002 2V4h-2zM3 4a2 2 0 01-2 2V4h2zm10 8a2 2 0 012-2v2h-2zM3 12a2 2 0 00-2-2v2h2zm7-4a2 2 0 11-4 0 2 2 0 014 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cash-stack" fill="currentColor" id="cash-stack" xmlns="http://www.w3.org/2000/svg"><path d="M14 3H1a1 1 0 011-1h12a1 1 0 011 1h-1z"/><path fill-rule="evenodd" d="M15 5H1v8h14V5zM1 4a1 1 0 00-1 1v8a1 1 0 001 1h14a1 1 0 001-1V5a1 1 0 00-1-1H1z"/><path d="M13 5a2 2 0 002 2V5h-2zM3 5a2 2 0 01-2 2V5h2zm10 8a2 2 0 012-2v2h-2zM3 13a2 2 0 00-2-2v2h2zm7-4a2 2 0 11-4 0 2 2 0 014 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cast" fill="currentColor" id="cast" xmlns="http://www.w3.org/2000/svg"><path d="M7.646 9.354l-3.792 3.792a.5.5 0 00.353.854h7.586a.5.5 0 00.354-.854L8.354 9.354a.5.5 0 00-.708 0z"/><path d="M11.414 11H14.5a.5.5 0 00.5-.5v-7a.5.5 0 00-.5-.5h-13a.5.5 0 00-.5.5v7a.5.5 0 00.5.5h3.086l-1 1H1.5A1.5 1.5 0 010 10.5v-7A1.5 1.5 0 011.5 2h13A1.5 1.5 0 0116 3.5v7a1.5 1.5 0 01-1.5 1.5h-2.086l-1-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat" fill="currentColor" id="chat" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.678 11.894a1 1 0 01.287.801 10.97 10.97 0 01-.398 2c1.395-.323 2.247-.697 2.634-.893a1 1 0 01.71-.074A8.06 8.06 0 008 14c3.996 0 7-2.807 7-6 0-3.192-3.004-6-7-6S1 4.808 1 8c0 1.468.617 2.83 1.678 3.894zm-.493 3.905a21.682 21.682 0 01-.713.129c-.2.032-.352-.176-.273-.362a9.68 9.68 0 00.244-.637l.003-.01c.248-.72.45-1.548.524-2.319C.743 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7-3.582 7-8 7a9.06 9.06 0 01-2.347-.306c-.52.263-1.639.742-3.468 1.105z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-dots" fill="currentColor" id="chat-dots" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.678 11.894a1 1 0 01.287.801 10.97 10.97 0 01-.398 2c1.395-.323 2.247-.697 2.634-.893a1 1 0 01.71-.074A8.06 8.06 0 008 14c3.996 0 7-2.807 7-6 0-3.192-3.004-6-7-6S1 4.808 1 8c0 1.468.617 2.83 1.678 3.894zm-.493 3.905a21.682 21.682 0 01-.713.129c-.2.032-.352-.176-.273-.362a9.68 9.68 0 00.244-.637l.003-.01c.248-.72.45-1.548.524-2.319C.743 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7-3.582 7-8 7a9.06 9.06 0 01-2.347-.306c-.52.263-1.639.742-3.468 1.105z"/><path d="M5 8a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-dots-fill" fill="currentColor" id="chat-dots-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8c0 3.866-3.582 7-8 7a9.06 9.06 0 01-2.347-.306c-.584.296-1.925.864-4.181 1.234-.2.032-.352-.176-.273-.362.354-.836.674-1.95.77-2.966C.744 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7zM5 8a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0zm3 1a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-fill" fill="currentColor" id="chat-fill" xmlns="http://www.w3.org/2000/svg"><path d="M8 15c4.418 0 8-3.134 8-7s-3.582-7-8-7-8 3.134-8 7c0 1.76.743 3.37 1.97 4.6-.097 1.016-.417 2.13-.771 2.966-.079.186.074.394.273.362 2.256-.37 3.597-.938 4.18-1.234A9.06 9.06 0 008 15z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-left" fill="currentColor" id="chat-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v11.586l2-2A2 2 0 014.414 11H14a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12.793a.5.5 0 00.854.353l2.853-2.853A1 1 0 014.414 12H14a2 2 0 002-2V2a2 2 0 00-2-2H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-left-dots" fill="currentColor" id="chat-left-dots" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v11.586l2-2A2 2 0 014.414 11H14a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12.793a.5.5 0 00.854.353l2.853-2.853A1 1 0 014.414 12H14a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path d="M5 6a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-left-dots-fill" fill="currentColor" id="chat-left-dots-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v8a2 2 0 01-2 2H4.414a1 1 0 00-.707.293L.854 15.146A.5.5 0 010 14.793V2zm5 4a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0zm3 1a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-left-fill" fill="currentColor" id="chat-left-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12.793a.5.5 0 00.854.353l2.853-2.853A1 1 0 014.414 12H14a2 2 0 002-2V2a2 2 0 00-2-2H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-left-quote" fill="currentColor" id="chat-left-quote" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v11.586l2-2A2 2 0 014.414 11H14a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12.793a.5.5 0 00.854.353l2.853-2.853A1 1 0 014.414 12H14a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M7.066 4.76A1.665 1.665 0 004 5.668a1.667 1.667 0 002.561 1.406c-.131.389-.375.804-.777 1.22a.417.417 0 10.6.58c1.486-1.54 1.293-3.214.682-4.112zm4 0A1.665 1.665 0 008 5.668a1.667 1.667 0 002.561 1.406c-.131.389-.375.804-.777 1.22a.417.417 0 10.6.58c1.486-1.54 1.293-3.214.682-4.112z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-left-quote-fill" fill="currentColor" id="chat-left-quote-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v8a2 2 0 01-2 2H4.414a1 1 0 00-.707.293L.854 15.146A.5.5 0 010 14.793V2zm7.194 2.766c.087.124.163.26.227.401.428.948.393 2.377-.942 3.706a.446.446 0 01-.612.01.405.405 0 01-.011-.59c.419-.416.672-.831.809-1.22-.269.165-.588.26-.93.26C4.775 7.333 4 6.587 4 5.667 4 4.747 4.776 4 5.734 4c.271 0 .528.06.756.166l.008.004c.169.07.327.182.469.324.085.083.161.174.227.272zM11 7.073c-.269.165-.588.26-.93.26-.958 0-1.735-.746-1.735-1.666 0-.92.777-1.667 1.734-1.667.271 0 .528.06.756.166l.008.004c.17.07.327.182.469.324.085.083.161.174.227.272.087.124.164.26.228.401.428.948.392 2.377-.942 3.706a.446.446 0 01-.613.01.405.405 0 01-.011-.59c.42-.416.672-.831.81-1.22z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-left-text" fill="currentColor" id="chat-left-text" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v11.586l2-2A2 2 0 014.414 11H14a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12.793a.5.5 0 00.854.353l2.853-2.853A1 1 0 014.414 12H14a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M3 3.5a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zM3 6a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9A.5.5 0 013 6zm0 2.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-left-text-fill" fill="currentColor" id="chat-left-text-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v8a2 2 0 01-2 2H4.414a1 1 0 00-.707.293L.854 15.146A.5.5 0 010 14.793V2zm3.5 1a.5.5 0 000 1h9a.5.5 0 000-1h-9zm0 2.5a.5.5 0 000 1h9a.5.5 0 000-1h-9zm0 2.5a.5.5 0 000 1h5a.5.5 0 000-1h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-quote" fill="currentColor" id="chat-quote" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.678 11.894a1 1 0 01.287.801 10.97 10.97 0 01-.398 2c1.395-.323 2.247-.697 2.634-.893a1 1 0 01.71-.074A8.06 8.06 0 008 14c3.996 0 7-2.807 7-6 0-3.192-3.004-6-7-6S1 4.808 1 8c0 1.468.617 2.83 1.678 3.894zm-.493 3.905a21.682 21.682 0 01-.713.129c-.2.032-.352-.176-.273-.362a9.68 9.68 0 00.244-.637l.003-.01c.248-.72.45-1.548.524-2.319C.743 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7-3.582 7-8 7a9.06 9.06 0 01-2.347-.306c-.52.263-1.639.742-3.468 1.105z"/><path d="M7.468 7.667c0 .92-.776 1.666-1.734 1.666S4 8.587 4 7.667C4 6.747 4.776 6 5.734 6s1.734.746 1.734 1.667z"/><path fill-rule="evenodd" d="M6.157 6.936a.438.438 0 01-.56.293.413.413 0 01-.274-.527c.08-.23.23-.44.477-.546a.891.891 0 01.698.014c.387.16.72.545.923.997.428.948.393 2.377-.942 3.706a.446.446 0 01-.612.01.405.405 0 01-.011-.59c1.093-1.087 1.058-2.158.77-2.794-.152-.336-.354-.514-.47-.563zm-.035-.012h-.001.001z"/><path d="M11.803 7.667c0 .92-.776 1.666-1.734 1.666-.957 0-1.734-.746-1.734-1.666 0-.92.777-1.667 1.734-1.667.958 0 1.734.746 1.734 1.667z"/><path fill-rule="evenodd" d="M10.492 6.936a.438.438 0 01-.56.293.413.413 0 01-.274-.527c.08-.23.23-.44.477-.546a.891.891 0 01.698.014c.387.16.72.545.924.997.428.948.392 2.377-.942 3.706a.446.446 0 01-.613.01.405.405 0 01-.011-.59c1.093-1.087 1.058-2.158.77-2.794-.152-.336-.354-.514-.469-.563zm-.034-.012h-.002.002z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-quote-fill" fill="currentColor" id="chat-quote-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8c0 3.866-3.582 7-8 7a9.06 9.06 0 01-2.347-.306c-.584.296-1.925.864-4.181 1.234-.2.032-.352-.176-.273-.362.354-.836.674-1.95.77-2.966C.744 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7zM7.194 6.766c.087.124.163.26.227.401.428.948.393 2.377-.942 3.706a.446.446 0 01-.612.01.405.405 0 01-.011-.59c.419-.416.672-.831.809-1.22-.269.165-.588.26-.93.26C4.775 9.333 4 8.587 4 7.667 4 6.747 4.776 6 5.734 6c.271 0 .528.06.756.166l.008.004c.169.07.327.182.469.324.085.083.161.174.227.272zM11 9.073c-.269.165-.588.26-.93.26-.958 0-1.735-.746-1.735-1.666 0-.92.777-1.667 1.734-1.667.271 0 .528.06.756.166l.008.004c.17.07.327.182.469.324.085.083.161.174.227.272.087.124.164.26.228.401.428.948.392 2.377-.942 3.706a.446.446 0 01-.613.01.405.405 0 01-.011-.59c.42-.416.672-.831.81-1.22z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-right" fill="currentColor" id="chat-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 1h12a1 1 0 011 1v11.586l-2-2A2 2 0 0011.586 11H2a1 1 0 01-1-1V2a1 1 0 011-1zm12-1a2 2 0 012 2v12.793a.5.5 0 01-.854.353l-2.853-2.853a1 1 0 00-.707-.293H2a2 2 0 01-2-2V2a2 2 0 012-2h12z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-right-dots" fill="currentColor" id="chat-right-dots" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 1h12a1 1 0 011 1v11.586l-2-2A2 2 0 0011.586 11H2a1 1 0 01-1-1V2a1 1 0 011-1zm12-1a2 2 0 012 2v12.793a.5.5 0 01-.854.353l-2.853-2.853a1 1 0 00-.707-.293H2a2 2 0 01-2-2V2a2 2 0 012-2h12z"/><path d="M5 6a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-right-dots-fill" fill="currentColor" id="chat-right-dots-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 2a2 2 0 00-2-2H2a2 2 0 00-2 2v8a2 2 0 002 2h9.586a1 1 0 01.707.293l2.853 2.853a.5.5 0 00.854-.353V2zM5 6a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0zm3 1a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-right-fill" fill="currentColor" id="chat-right-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 0a2 2 0 012 2v12.793a.5.5 0 01-.854.353l-2.853-2.853a1 1 0 00-.707-.293H2a2 2 0 01-2-2V2a2 2 0 012-2h12z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-right-quote" fill="currentColor" id="chat-right-quote" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 1h12a1 1 0 011 1v11.586l-2-2A2 2 0 0011.586 11H2a1 1 0 01-1-1V2a1 1 0 011-1zm12-1a2 2 0 012 2v12.793a.5.5 0 01-.854.353l-2.853-2.853a1 1 0 00-.707-.293H2a2 2 0 01-2-2V2a2 2 0 012-2h12z"/><path fill-rule="evenodd" d="M7.066 4.76A1.665 1.665 0 004 5.668a1.667 1.667 0 002.561 1.406c-.131.389-.375.804-.777 1.22a.417.417 0 10.6.58c1.486-1.54 1.293-3.214.682-4.112zm4 0A1.665 1.665 0 008 5.668a1.667 1.667 0 002.561 1.406c-.131.389-.375.804-.777 1.22a.417.417 0 10.6.58c1.486-1.54 1.293-3.214.682-4.112z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-right-quote-fill" fill="currentColor" id="chat-right-quote-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 2a2 2 0 00-2-2H2a2 2 0 00-2 2v8a2 2 0 002 2h9.586a1 1 0 01.707.293l2.853 2.853a.5.5 0 00.854-.353V2zM7.194 4.766c.087.124.163.26.227.401.428.948.393 2.377-.942 3.706a.446.446 0 01-.612.01.405.405 0 01-.011-.59c.419-.416.672-.831.809-1.22-.269.165-.588.26-.93.26C4.775 7.333 4 6.587 4 5.667 4 4.747 4.776 4 5.734 4c.271 0 .528.06.756.166l.008.004c.169.07.327.182.469.324.085.083.161.174.227.272zM11 7.073c-.269.165-.588.26-.93.26-.958 0-1.735-.746-1.735-1.666 0-.92.777-1.667 1.734-1.667.271 0 .528.06.756.166l.008.004c.17.07.327.182.469.324.085.083.161.174.227.272.087.124.164.26.228.401.428.948.392 2.377-.942 3.706a.446.446 0 01-.613.01.405.405 0 01-.011-.59c.42-.416.672-.831.81-1.22z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-right-text" fill="currentColor" id="chat-right-text" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 1h12a1 1 0 011 1v11.586l-2-2A2 2 0 0011.586 11H2a1 1 0 01-1-1V2a1 1 0 011-1zm12-1a2 2 0 012 2v12.793a.5.5 0 01-.854.353l-2.853-2.853a1 1 0 00-.707-.293H2a2 2 0 01-2-2V2a2 2 0 012-2h12z"/><path fill-rule="evenodd" d="M3 3.5a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zM3 6a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9A.5.5 0 013 6zm0 2.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-right-text-fill" fill="currentColor" id="chat-right-text-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 2a2 2 0 00-2-2H2a2 2 0 00-2 2v8a2 2 0 002 2h9.586a1 1 0 01.707.293l2.853 2.853a.5.5 0 00.854-.353V2zM3.5 3a.5.5 0 000 1h9a.5.5 0 000-1h-9zm0 2.5a.5.5 0 000 1h9a.5.5 0 000-1h-9zm0 2.5a.5.5 0 000 1h5a.5.5 0 000-1h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-square" fill="currentColor" id="chat-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v8a1 1 0 001 1h2.5a2 2 0 011.6.8L8 14.333 9.9 11.8a2 2 0 011.6-.8H14a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v8a2 2 0 002 2h2.5a1 1 0 01.8.4l1.9 2.533a1 1 0 001.6 0l1.9-2.533a1 1 0 01.8-.4H14a2 2 0 002-2V2a2 2 0 00-2-2H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-square-dots" fill="currentColor" id="chat-square-dots" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v8a1 1 0 001 1h2.5a2 2 0 011.6.8L8 14.333 9.9 11.8a2 2 0 011.6-.8H14a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v8a2 2 0 002 2h2.5a1 1 0 01.8.4l1.9 2.533a1 1 0 001.6 0l1.9-2.533a1 1 0 01.8-.4H14a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path d="M5 6a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-square-dots-fill" fill="currentColor" id="chat-square-dots-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v8a2 2 0 01-2 2h-2.5a1 1 0 00-.8.4l-1.9 2.533a1 1 0 01-1.6 0L5.3 12.4a1 1 0 00-.8-.4H2a2 2 0 01-2-2V2zm5 4a1 1 0 11-2 0 1 1 0 012 0zm4 0a1 1 0 11-2 0 1 1 0 012 0zm3 1a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-square-fill" fill="currentColor" id="chat-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v8a2 2 0 002 2h2.5a1 1 0 01.8.4l1.9 2.533a1 1 0 001.6 0l1.9-2.533a1 1 0 01.8-.4H14a2 2 0 002-2V2a2 2 0 00-2-2H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-square-quote" fill="currentColor" id="chat-square-quote" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v8a1 1 0 001 1h2.5a2 2 0 011.6.8L8 14.333 9.9 11.8a2 2 0 011.6-.8H14a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v8a2 2 0 002 2h2.5a1 1 0 01.8.4l1.9 2.533a1 1 0 001.6 0l1.9-2.533a1 1 0 01.8-.4H14a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M7.066 4.76A1.665 1.665 0 004 5.668a1.667 1.667 0 002.561 1.406c-.131.389-.375.804-.777 1.22a.417.417 0 10.6.58c1.486-1.54 1.293-3.214.682-4.112zm4 0A1.665 1.665 0 008 5.668a1.667 1.667 0 002.561 1.406c-.131.389-.375.804-.777 1.22a.417.417 0 10.6.58c1.486-1.54 1.293-3.214.682-4.112z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-square-quote-fill" fill="currentColor" id="chat-square-quote-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v8a2 2 0 01-2 2h-2.5a1 1 0 00-.8.4l-1.9 2.533a1 1 0 01-1.6 0L5.3 12.4a1 1 0 00-.8-.4H2a2 2 0 01-2-2V2zm7.194 2.766c.087.124.163.26.227.401.428.948.393 2.377-.942 3.706a.446.446 0 01-.612.01.405.405 0 01-.011-.59c.419-.416.672-.831.809-1.22-.269.165-.588.26-.93.26C4.775 7.333 4 6.587 4 5.667 4 4.747 4.776 4 5.734 4c.271 0 .528.06.756.166l.008.004c.169.07.327.182.469.324.085.083.161.174.227.272zM11 7.073c-.269.165-.588.26-.93.26-.958 0-1.735-.746-1.735-1.666 0-.92.777-1.667 1.734-1.667.271 0 .528.06.756.166l.008.004c.17.07.327.182.469.324.085.083.161.174.227.272.087.124.164.26.228.401.428.948.392 2.377-.942 3.706a.446.446 0 01-.613.01.405.405 0 01-.011-.59c.42-.416.672-.831.81-1.22z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-square-text" fill="currentColor" id="chat-square-text" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v8a1 1 0 001 1h2.5a2 2 0 011.6.8L8 14.333 9.9 11.8a2 2 0 011.6-.8H14a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v8a2 2 0 002 2h2.5a1 1 0 01.8.4l1.9 2.533a1 1 0 001.6 0l1.9-2.533a1 1 0 01.8-.4H14a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M3 3.5a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zM3 6a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9A.5.5 0 013 6zm0 2.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-square-text-fill" fill="currentColor" id="chat-square-text-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v8a2 2 0 01-2 2h-2.5a1 1 0 00-.8.4l-1.9 2.533a1 1 0 01-1.6 0L5.3 12.4a1 1 0 00-.8-.4H2a2 2 0 01-2-2V2zm3.5 1a.5.5 0 000 1h9a.5.5 0 000-1h-9zm0 2.5a.5.5 0 000 1h9a.5.5 0 000-1h-9zm0 2.5a.5.5 0 000 1h5a.5.5 0 000-1h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-text" fill="currentColor" id="chat-text" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.678 11.894a1 1 0 01.287.801 10.97 10.97 0 01-.398 2c1.395-.323 2.247-.697 2.634-.893a1 1 0 01.71-.074A8.06 8.06 0 008 14c3.996 0 7-2.807 7-6 0-3.192-3.004-6-7-6S1 4.808 1 8c0 1.468.617 2.83 1.678 3.894zm-.493 3.905a21.682 21.682 0 01-.713.129c-.2.032-.352-.176-.273-.362a9.68 9.68 0 00.244-.637l.003-.01c.248-.72.45-1.548.524-2.319C.743 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7-3.582 7-8 7a9.06 9.06 0 01-2.347-.306c-.52.263-1.639.742-3.468 1.105z"/><path fill-rule="evenodd" d="M4 5.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zM4 8a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7A.5.5 0 014 8zm0 2.5a.5.5 0 01.5-.5h4a.5.5 0 010 1h-4a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chat-text-fill" fill="currentColor" id="chat-text-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8c0 3.866-3.582 7-8 7a9.06 9.06 0 01-2.347-.306c-.584.296-1.925.864-4.181 1.234-.2.032-.352-.176-.273-.362.354-.836.674-1.95.77-2.966C.744 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7zM4.5 5a.5.5 0 000 1h7a.5.5 0 000-1h-7zm0 2.5a.5.5 0 000 1h7a.5.5 0 000-1h-7zm0 2.5a.5.5 0 000 1h4a.5.5 0 000-1h-4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-check" fill="currentColor" id="check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 011.071 1.05l-3.992 4.99a.75.75 0 01-1.08.02L4.324 8.384a.75.75 0 111.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 01.02-.022z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-check-all" fill="currentColor" id="check-all" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.97 4.97a.75.75 0 011.071 1.05l-3.992 4.99a.75.75 0 01-1.08.02L2.324 8.384a.75.75 0 111.06-1.06l2.094 2.093L8.95 4.992a.252.252 0 01.02-.022zm-.92 5.14l.92.92a.75.75 0 001.079-.02l3.992-4.99a.75.75 0 10-1.091-1.028L9.477 9.417l-.485-.486-.943 1.179z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-check-circle" fill="currentColor" id="check-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 011.071 1.05l-3.992 4.99a.75.75 0 01-1.08.02L4.324 8.384a.75.75 0 111.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 01.02-.022z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-check-circle-fill" fill="currentColor" id="check-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zm-3.97-3.03a.75.75 0 00-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 00-1.06 1.06L6.97 11.03a.75.75 0 001.079-.02l3.992-4.99a.75.75 0 00-.01-1.05z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-check-square" fill="currentColor" id="check-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M10.97 4.97a.75.75 0 011.071 1.05l-3.992 4.99a.75.75 0 01-1.08.02L4.324 8.384a.75.75 0 111.06-1.06l2.094 2.093 3.473-4.425a.236.236 0 01.02-.022z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-check-square-fill" fill="currentColor" id="check-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm10.03 4.97a.75.75 0 00-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 00-1.06 1.06L6.97 11.03a.75.75 0 001.079-.02l3.992-4.99a.75.75 0 00-.01-1.05z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-check2" fill="currentColor" id="check2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 010 .708l-7 7a.5.5 0 01-.708 0l-3.5-3.5a.5.5 0 11.708-.708L6.5 10.293l6.646-6.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-check2-all" fill="currentColor" id="check2-all" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12.354 3.646a.5.5 0 010 .708l-7 7a.5.5 0 01-.708 0l-3.5-3.5a.5.5 0 11.708-.708L5 10.293l6.646-6.647a.5.5 0 01.708 0z"/><path d="M6.25 8.043l-.896-.897a.5.5 0 10-.708.708l.897.896.707-.707zm1 2.414l.896.897a.5.5 0 00.708 0l7-7a.5.5 0 00-.708-.708L8.5 10.293l-.543-.543-.707.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-check2-circle" fill="currentColor" id="check2-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15.354 2.646a.5.5 0 010 .708l-7 7a.5.5 0 01-.708 0l-3-3a.5.5 0 11.708-.708L8 9.293l6.646-6.647a.5.5 0 01.708 0z"/><path fill-rule="evenodd" d="M8 2.5A5.5 5.5 0 1013.5 8a.5.5 0 011 0 6.5 6.5 0 11-3.25-5.63.5.5 0 11-.5.865A5.472 5.472 0 008 2.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-check2-square" fill="currentColor" id="check2-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15.354 2.646a.5.5 0 010 .708l-7 7a.5.5 0 01-.708 0l-3-3a.5.5 0 11.708-.708L8 9.293l6.646-6.647a.5.5 0 01.708 0z"/><path fill-rule="evenodd" d="M1.5 13A1.5 1.5 0 003 14.5h10a1.5 1.5 0 001.5-1.5V8a.5.5 0 00-1 0v5a.5.5 0 01-.5.5H3a.5.5 0 01-.5-.5V3a.5.5 0 01.5-.5h8a.5.5 0 000-1H3A1.5 1.5 0 001.5 3v10z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-bar-contract" fill="currentColor" id="chevron-bar-contract" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.646 14.854a.5.5 0 00.708 0L8 11.207l3.646 3.647a.5.5 0 00.708-.708l-4-4a.5.5 0 00-.708 0l-4 4a.5.5 0 000 .708zm0-13.708a.5.5 0 01.708 0L8 4.793l3.646-3.647a.5.5 0 01.708.708l-4 4a.5.5 0 01-.708 0l-4-4a.5.5 0 010-.708zM1 8a.5.5 0 01.5-.5h13a.5.5 0 010 1h-13A.5.5 0 011 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-bar-down" fill="currentColor" id="chevron-bar-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.646 4.146a.5.5 0 01.708 0L8 7.793l3.646-3.647a.5.5 0 01.708.708l-4 4a.5.5 0 01-.708 0l-4-4a.5.5 0 010-.708zM1 11.5a.5.5 0 01.5-.5h13a.5.5 0 010 1h-13a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-bar-expand" fill="currentColor" id="chevron-bar-expand" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.646 10.146a.5.5 0 01.708 0L8 13.793l3.646-3.647a.5.5 0 01.708.708l-4 4a.5.5 0 01-.708 0l-4-4a.5.5 0 010-.708zm0-4.292a.5.5 0 00.708 0L8 2.207l3.646 3.647a.5.5 0 00.708-.708l-4-4a.5.5 0 00-.708 0l-4 4a.5.5 0 000 .708zM1 8a.5.5 0 01.5-.5h13a.5.5 0 010 1h-13A.5.5 0 011 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-bar-left" fill="currentColor" id="chevron-bar-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.854 3.646a.5.5 0 010 .708L8.207 8l3.647 3.646a.5.5 0 01-.708.708l-4-4a.5.5 0 010-.708l4-4a.5.5 0 01.708 0zM4.5 1a.5.5 0 00-.5.5v13a.5.5 0 001 0v-13a.5.5 0 00-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-bar-right" fill="currentColor" id="chevron-bar-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.146 3.646a.5.5 0 000 .708L7.793 8l-3.647 3.646a.5.5 0 00.708.708l4-4a.5.5 0 000-.708l-4-4a.5.5 0 00-.708 0zM11.5 1a.5.5 0 01.5.5v13a.5.5 0 01-1 0v-13a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-bar-up" fill="currentColor" id="chevron-bar-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.646 11.854a.5.5 0 00.708 0L8 8.207l3.646 3.647a.5.5 0 00.708-.708l-4-4a.5.5 0 00-.708 0l-4 4a.5.5 0 000 .708zM2.4 5.2c0 .22.18.4.4.4h10.4a.4.4 0 000-.8H2.8a.4.4 0 00-.4.4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-compact-down" fill="currentColor" id="chevron-compact-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.553 6.776a.5.5 0 01.67-.223L8 9.44l5.776-2.888a.5.5 0 11.448.894l-6 3a.5.5 0 01-.448 0l-6-3a.5.5 0 01-.223-.67z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-compact-left" fill="currentColor" id="chevron-compact-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.224 1.553a.5.5 0 01.223.67L6.56 8l2.888 5.776a.5.5 0 11-.894.448l-3-6a.5.5 0 010-.448l3-6a.5.5 0 01.67-.223z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-compact-right" fill="currentColor" id="chevron-compact-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.776 1.553a.5.5 0 01.671.223l3 6a.5.5 0 010 .448l-3 6a.5.5 0 11-.894-.448L9.44 8 6.553 2.224a.5.5 0 01.223-.671z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-compact-up" fill="currentColor" id="chevron-compact-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.776 5.553a.5.5 0 01.448 0l6 3a.5.5 0 11-.448.894L8 6.56 2.224 9.447a.5.5 0 11-.448-.894l6-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-contract" fill="currentColor" id="chevron-contract" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.646 13.854a.5.5 0 00.708 0L8 10.207l3.646 3.647a.5.5 0 00.708-.708l-4-4a.5.5 0 00-.708 0l-4 4a.5.5 0 000 .708zm0-11.708a.5.5 0 01.708 0L8 5.793l3.646-3.647a.5.5 0 01.708.708l-4 4a.5.5 0 01-.708 0l-4-4a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-double-down" fill="currentColor" id="chevron-double-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.646 6.646a.5.5 0 01.708 0L8 12.293l5.646-5.647a.5.5 0 01.708.708l-6 6a.5.5 0 01-.708 0l-6-6a.5.5 0 010-.708z"/><path fill-rule="evenodd" d="M1.646 2.646a.5.5 0 01.708 0L8 8.293l5.646-5.647a.5.5 0 01.708.708l-6 6a.5.5 0 01-.708 0l-6-6a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-double-left" fill="currentColor" id="chevron-double-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.354 1.646a.5.5 0 010 .708L2.707 8l5.647 5.646a.5.5 0 01-.708.708l-6-6a.5.5 0 010-.708l6-6a.5.5 0 01.708 0z"/><path fill-rule="evenodd" d="M12.354 1.646a.5.5 0 010 .708L6.707 8l5.647 5.646a.5.5 0 01-.708.708l-6-6a.5.5 0 010-.708l6-6a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-double-right" fill="currentColor" id="chevron-double-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.646 1.646a.5.5 0 01.708 0l6 6a.5.5 0 010 .708l-6 6a.5.5 0 01-.708-.708L9.293 8 3.646 2.354a.5.5 0 010-.708z"/><path fill-rule="evenodd" d="M7.646 1.646a.5.5 0 01.708 0l6 6a.5.5 0 010 .708l-6 6a.5.5 0 01-.708-.708L13.293 8 7.646 2.354a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-double-up" fill="currentColor" id="chevron-double-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.646 2.646a.5.5 0 01.708 0l6 6a.5.5 0 01-.708.708L8 3.707 2.354 9.354a.5.5 0 11-.708-.708l6-6z"/><path fill-rule="evenodd" d="M7.646 6.646a.5.5 0 01.708 0l6 6a.5.5 0 01-.708.708L8 7.707l-5.646 5.647a.5.5 0 01-.708-.708l6-6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-down" fill="currentColor" id="chevron-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 01.708 0L8 10.293l5.646-5.647a.5.5 0 01.708.708l-6 6a.5.5 0 01-.708 0l-6-6a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-expand" fill="currentColor" id="chevron-expand" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.646 9.146a.5.5 0 01.708 0L8 12.793l3.646-3.647a.5.5 0 01.708.708l-4 4a.5.5 0 01-.708 0l-4-4a.5.5 0 010-.708zm0-2.292a.5.5 0 00.708 0L8 3.207l3.646 3.647a.5.5 0 00.708-.708l-4-4a.5.5 0 00-.708 0l-4 4a.5.5 0 000 .708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-left" fill="currentColor" id="chevron-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 010 .708L5.707 8l5.647 5.646a.5.5 0 01-.708.708l-6-6a.5.5 0 010-.708l6-6a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-right" fill="currentColor" id="chevron-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 01.708 0l6 6a.5.5 0 010 .708l-6 6a.5.5 0 01-.708-.708L10.293 8 4.646 2.354a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-chevron-up" fill="currentColor" id="chevron-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.646 4.646a.5.5 0 01.708 0l6 6a.5.5 0 01-.708.708L8 5.707l-5.646 5.647a.5.5 0 01-.708-.708l6-6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-circle" fill="currentColor" id="circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-circle-fill" fill="currentColor" id="circle-fill" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="8"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-circle-half" fill="currentColor" id="circle-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15V1a7 7 0 110 14zm0 1A8 8 0 118 0a8 8 0 010 16z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-circle-square" fill="currentColor" id="circle-square" xmlns="http://www.w3.org/2000/svg"><path d="M0 6a6 6 0 1112 0A6 6 0 010 6z"/><path d="M12.93 5h1.57a.5.5 0 01.5.5v9a.5.5 0 01-.5.5h-9a.5.5 0 01-.5-.5v-1.57a6.953 6.953 0 01-1-.22v1.79A1.5 1.5 0 005.5 16h9a1.5 1.5 0 001.5-1.5v-9A1.5 1.5 0 0014.5 4h-1.79c.097.324.17.658.22 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-clipboard" fill="currentColor" id="clipboard" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 1.5H3a2 2 0 00-2 2V14a2 2 0 002 2h10a2 2 0 002-2V3.5a2 2 0 00-2-2h-1v1h1a1 1 0 011 1V14a1 1 0 01-1 1H3a1 1 0 01-1-1V3.5a1 1 0 011-1h1v-1z"/><path fill-rule="evenodd" d="M9.5 1h-3a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5zm-3-1A1.5 1.5 0 005 1.5v1A1.5 1.5 0 006.5 4h3A1.5 1.5 0 0011 2.5v-1A1.5 1.5 0 009.5 0h-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-clipboard-check" fill="currentColor" id="clipboard-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 1.5H3a2 2 0 00-2 2V14a2 2 0 002 2h10a2 2 0 002-2V3.5a2 2 0 00-2-2h-1v1h1a1 1 0 011 1V14a1 1 0 01-1 1H3a1 1 0 01-1-1V3.5a1 1 0 011-1h1v-1z"/><path fill-rule="evenodd" d="M9.5 1h-3a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5zm-3-1A1.5 1.5 0 005 1.5v1A1.5 1.5 0 006.5 4h3A1.5 1.5 0 0011 2.5v-1A1.5 1.5 0 009.5 0h-3zm4.354 7.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 11.708-.708L7.5 9.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-clipboard-data" fill="currentColor" id="clipboard-data" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 1.5H3a2 2 0 00-2 2V14a2 2 0 002 2h10a2 2 0 002-2V3.5a2 2 0 00-2-2h-1v1h1a1 1 0 011 1V14a1 1 0 01-1 1H3a1 1 0 01-1-1V3.5a1 1 0 011-1h1v-1z"/><path fill-rule="evenodd" d="M9.5 1h-3a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5zm-3-1A1.5 1.5 0 005 1.5v1A1.5 1.5 0 006.5 4h3A1.5 1.5 0 0011 2.5v-1A1.5 1.5 0 009.5 0h-3z"/><path d="M4 11a1 1 0 112 0v1a1 1 0 11-2 0v-1zm6-4a1 1 0 112 0v5a1 1 0 11-2 0V7zM7 9a1 1 0 012 0v3a1 1 0 11-2 0V9z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-clipboard-minus" fill="currentColor" id="clipboard-minus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 1.5H3a2 2 0 00-2 2V14a2 2 0 002 2h10a2 2 0 002-2V3.5a2 2 0 00-2-2h-1v1h1a1 1 0 011 1V14a1 1 0 01-1 1H3a1 1 0 01-1-1V3.5a1 1 0 011-1h1v-1z"/><path fill-rule="evenodd" d="M9.5 1h-3a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5zm-3-1A1.5 1.5 0 005 1.5v1A1.5 1.5 0 006.5 4h3A1.5 1.5 0 0011 2.5v-1A1.5 1.5 0 009.5 0h-3zm-1 9.5A.5.5 0 016 9h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-clipboard-plus" fill="currentColor" id="clipboard-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 1.5H3a2 2 0 00-2 2V14a2 2 0 002 2h10a2 2 0 002-2V3.5a2 2 0 00-2-2h-1v1h1a1 1 0 011 1V14a1 1 0 01-1 1H3a1 1 0 01-1-1V3.5a1 1 0 011-1h1v-1z"/><path fill-rule="evenodd" d="M9.5 1h-3a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5zm-3-1A1.5 1.5 0 005 1.5v1A1.5 1.5 0 006.5 4h3A1.5 1.5 0 0011 2.5v-1A1.5 1.5 0 009.5 0h-3zM8 7a.5.5 0 01.5.5V9H10a.5.5 0 010 1H8.5v1.5a.5.5 0 01-1 0V10H6a.5.5 0 010-1h1.5V7.5A.5.5 0 018 7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-clipboard-x" fill="currentColor" id="clipboard-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 1.5H3a2 2 0 00-2 2V14a2 2 0 002 2h10a2 2 0 002-2V3.5a2 2 0 00-2-2h-1v1h1a1 1 0 011 1V14a1 1 0 01-1 1H3a1 1 0 01-1-1V3.5a1 1 0 011-1h1v-1z"/><path fill-rule="evenodd" d="M9.5 1h-3a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5zm-3-1A1.5 1.5 0 005 1.5v1A1.5 1.5 0 006.5 4h3A1.5 1.5 0 0011 2.5v-1A1.5 1.5 0 009.5 0h-3zm-.354 7.146a.5.5 0 01.708 0L8 8.293l1.146-1.147a.5.5 0 11.708.708L8.707 9l1.147 1.146a.5.5 0 01-.708.708L8 9.707l-1.146 1.147a.5.5 0 01-.708-.708L7.293 9 6.146 7.854a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-clock" fill="currentColor" id="clock" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm8-7A8 8 0 110 8a8 8 0 0116 0z"/><path fill-rule="evenodd" d="M7.5 3a.5.5 0 01.5.5v5.21l3.248 1.856a.5.5 0 01-.496.868l-3.5-2A.5.5 0 017 9V3.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-clock-fill" fill="currentColor" id="clock-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zM8 3.5a.5.5 0 00-1 0V9a.5.5 0 00.252.434l3.5 2a.5.5 0 00.496-.868L8 8.71V3.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-clock-history" fill="currentColor" id="clock-history" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.515 1.019A7 7 0 008 1V0a8 8 0 01.589.022l-.074.997zm2.004.45a7.003 7.003 0 00-.985-.299l.219-.976c.383.086.76.2 1.126.342l-.36.933zm1.37.71a7.01 7.01 0 00-.439-.27l.493-.87a8.025 8.025 0 01.979.654l-.615.789a6.996 6.996 0 00-.418-.302zm1.834 1.79a6.99 6.99 0 00-.653-.796l.724-.69c.27.285.52.59.747.91l-.818.576zm.744 1.352a7.08 7.08 0 00-.214-.468l.893-.45a7.976 7.976 0 01.45 1.088l-.95.313a7.023 7.023 0 00-.179-.483zm.53 2.507a6.991 6.991 0 00-.1-1.025l.985-.17c.067.386.106.778.116 1.17l-1 .025zm-.131 1.538c.033-.17.06-.339.081-.51l.993.123a7.957 7.957 0 01-.23 1.155l-.964-.267c.046-.165.086-.332.12-.501zm-.952 2.379c.184-.29.346-.594.486-.908l.914.405c-.16.36-.345.706-.555 1.038l-.845-.535zm-.964 1.205c.122-.122.239-.248.35-.378l.758.653a8.073 8.073 0 01-.401.432l-.707-.707z"/><path fill-rule="evenodd" d="M8 1a7 7 0 104.95 11.95l.707.707A8.001 8.001 0 118 0v1z"/><path fill-rule="evenodd" d="M7.5 3a.5.5 0 01.5.5v5.21l3.248 1.856a.5.5 0 01-.496.868l-3.5-2A.5.5 0 017 9V3.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud" fill="currentColor" id="cloud" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.406 3.342A5.53 5.53 0 018 2c2.69 0 4.923 2 5.166 4.579C14.758 6.804 16 8.137 16 9.773 16 11.569 14.502 13 12.687 13H3.781C1.708 13 0 11.366 0 9.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383zm.653.757c-.757.653-1.153 1.44-1.153 2.056v.448l-.445.049C2.064 6.805 1 7.952 1 9.318 1 10.785 2.23 12 3.781 12h8.906C13.98 12 15 10.988 15 9.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 4.825 10.328 3 8 3a4.53 4.53 0 00-2.941 1.1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-arrow-down" fill="currentColor" id="cloud-arrow-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.406 3.342A5.53 5.53 0 018 2c2.69 0 4.923 2 5.166 4.579C14.758 6.804 16 8.137 16 9.773 16 11.569 14.502 13 12.687 13H3.781C1.708 13 0 11.366 0 9.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383zm.653.757c-.757.653-1.153 1.44-1.153 2.056v.448l-.445.049C2.064 6.805 1 7.952 1 9.318 1 10.785 2.23 12 3.781 12h8.906C13.98 12 15 10.988 15 9.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 4.825 10.328 3 8 3a4.53 4.53 0 00-2.941 1.1z"/><path fill-rule="evenodd" d="M7.646 10.854a.5.5 0 00.708 0l2-2a.5.5 0 00-.708-.708L8.5 9.293V5.5a.5.5 0 00-1 0v3.793L6.354 8.146a.5.5 0 10-.708.708l2 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-arrow-down-fill" fill="currentColor" id="cloud-arrow-down-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 2a5.53 5.53 0 00-3.594 1.342c-.766.66-1.321 1.52-1.464 2.383C1.266 6.095 0 7.555 0 9.318 0 11.366 1.708 13 3.781 13h8.906C14.502 13 16 11.57 16 9.773c0-1.636-1.242-2.969-2.834-3.194C12.923 3.999 10.69 2 8 2zm2.354 6.854l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 11.708-.708L7.5 9.293V5.5a.5.5 0 011 0v3.793l1.146-1.147a.5.5 0 01.708.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-arrow-up" fill="currentColor" id="cloud-arrow-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.406 3.342A5.53 5.53 0 018 2c2.69 0 4.923 2 5.166 4.579C14.758 6.804 16 8.137 16 9.773 16 11.569 14.502 13 12.687 13H3.781C1.708 13 0 11.366 0 9.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383zm.653.757c-.757.653-1.153 1.44-1.153 2.056v.448l-.445.049C2.064 6.805 1 7.952 1 9.318 1 10.785 2.23 12 3.781 12h8.906C13.98 12 15 10.988 15 9.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 4.825 10.328 3 8 3a4.53 4.53 0 00-2.941 1.1z"/><path fill-rule="evenodd" d="M7.646 5.146a.5.5 0 01.708 0l2 2a.5.5 0 01-.708.708L8.5 6.707V10.5a.5.5 0 01-1 0V6.707L6.354 7.854a.5.5 0 11-.708-.708l2-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-arrow-up-fill" fill="currentColor" id="cloud-arrow-up-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 2a5.53 5.53 0 00-3.594 1.342c-.766.66-1.321 1.52-1.464 2.383C1.266 6.095 0 7.555 0 9.318 0 11.366 1.708 13 3.781 13h8.906C14.502 13 16 11.57 16 9.773c0-1.636-1.242-2.969-2.834-3.194C12.923 3.999 10.69 2 8 2zm2.354 5.146l-2-2a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L7.5 6.707V10.5a.5.5 0 001 0V6.707l1.146 1.147a.5.5 0 00.708-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-check" fill="currentColor" id="cloud-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.406 3.342A5.53 5.53 0 018 2c2.69 0 4.923 2 5.166 4.579C14.758 6.804 16 8.137 16 9.773 16 11.569 14.502 13 12.687 13H3.781C1.708 13 0 11.366 0 9.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383zm.653.757c-.757.653-1.153 1.44-1.153 2.056v.448l-.445.049C2.064 6.805 1 7.952 1 9.318 1 10.785 2.23 12 3.781 12h8.906C13.98 12 15 10.988 15 9.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 4.825 10.328 3 8 3a4.53 4.53 0 00-2.941 1.1z"/><path fill-rule="evenodd" d="M10.354 6.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 11.708-.708L7 8.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-check-fill" fill="currentColor" id="cloud-check-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 2a5.53 5.53 0 00-3.594 1.342c-.766.66-1.321 1.52-1.464 2.383C1.266 6.095 0 7.555 0 9.318 0 11.366 1.708 13 3.781 13h8.906C14.502 13 16 11.57 16 9.773c0-1.636-1.242-2.969-2.834-3.194C12.923 3.999 10.69 2 8 2zm2.354 4.854a.5.5 0 00-.708-.708L7 8.793 5.854 7.646a.5.5 0 10-.708.708l1.5 1.5a.5.5 0 00.708 0l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-download" fill="currentColor" id="cloud-download" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.406 1.342A5.53 5.53 0 018 0c2.69 0 4.923 2 5.166 4.579C14.758 4.804 16 6.137 16 7.773 16 9.569 14.502 11 12.687 11H10a.5.5 0 010-1h2.688C13.979 10 15 8.988 15 7.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 2.825 10.328 1 8 1a4.53 4.53 0 00-2.941 1.1c-.757.652-1.153 1.438-1.153 2.055v.448l-.445.049C2.064 4.805 1 5.952 1 7.318 1 8.785 2.23 10 3.781 10H6a.5.5 0 010 1H3.781C1.708 11 0 9.366 0 7.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383z"/><path fill-rule="evenodd" d="M7.646 15.854a.5.5 0 00.708 0l3-3a.5.5 0 00-.708-.708L8.5 14.293V5.5a.5.5 0 00-1 0v8.793l-2.146-2.147a.5.5 0 00-.708.708l3 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-download-fill" fill="currentColor" id="cloud-download-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 0a5.53 5.53 0 00-3.594 1.342c-.766.66-1.321 1.52-1.464 2.383C1.266 4.095 0 5.555 0 7.318 0 9.366 1.708 11 3.781 11H7.5V5.5a.5.5 0 011 0V11h4.188C14.502 11 16 9.57 16 7.773c0-1.636-1.242-2.969-2.834-3.194C12.923 1.999 10.69 0 8 0zm-.354 15.854a.5.5 0 00.708 0l3-3a.5.5 0 00-.708-.708L8.5 14.293V11h-1v3.293l-2.146-2.147a.5.5 0 00-.708.708l3 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-fill" fill="currentColor" id="cloud-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.406 3.342A5.53 5.53 0 018 2c2.69 0 4.923 2 5.166 4.579C14.758 6.804 16 8.137 16 9.773 16 11.569 14.502 13 12.687 13H3.781C1.708 13 0 11.366 0 9.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-minus" fill="currentColor" id="cloud-minus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.406 3.342A5.53 5.53 0 018 2c2.69 0 4.923 2 5.166 4.579C14.758 6.804 16 8.137 16 9.773 16 11.569 14.502 13 12.687 13H3.781C1.708 13 0 11.366 0 9.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383zm.653.757c-.757.653-1.153 1.44-1.153 2.056v.448l-.445.049C2.064 6.805 1 7.952 1 9.318 1 10.785 2.23 12 3.781 12h8.906C13.98 12 15 10.988 15 9.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 4.825 10.328 3 8 3a4.53 4.53 0 00-2.941 1.1z"/><path fill-rule="evenodd" d="M5.5 8a.5.5 0 01.5-.5h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-minus-fill" fill="currentColor" id="cloud-minus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 2a5.53 5.53 0 00-3.594 1.342c-.766.66-1.321 1.52-1.464 2.383C1.266 6.095 0 7.555 0 9.318 0 11.366 1.708 13 3.781 13h8.906C14.502 13 16 11.57 16 9.773c0-1.636-1.242-2.969-2.834-3.194C12.923 3.999 10.69 2 8 2zM6 7.5a.5.5 0 000 1h4a.5.5 0 000-1H6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-plus" fill="currentColor" id="cloud-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.406 3.342A5.53 5.53 0 018 2c2.69 0 4.923 2 5.166 4.579C14.758 6.804 16 8.137 16 9.773 16 11.569 14.502 13 12.687 13H3.781C1.708 13 0 11.366 0 9.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383zm.653.757c-.757.653-1.153 1.44-1.153 2.056v.448l-.445.049C2.064 6.805 1 7.952 1 9.318 1 10.785 2.23 12 3.781 12h8.906C13.98 12 15 10.988 15 9.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 4.825 10.328 3 8 3a4.53 4.53 0 00-2.941 1.1z"/><path fill-rule="evenodd" d="M8 5.5a.5.5 0 01.5.5v1.5H10a.5.5 0 010 1H8.5V10a.5.5 0 01-1 0V8.5H6a.5.5 0 010-1h1.5V6a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-plus-fill" fill="currentColor" id="cloud-plus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 2a5.53 5.53 0 00-3.594 1.342c-.766.66-1.321 1.52-1.464 2.383C1.266 6.095 0 7.555 0 9.318 0 11.366 1.708 13 3.781 13h8.906C14.502 13 16 11.57 16 9.773c0-1.636-1.242-2.969-2.834-3.194C12.923 3.999 10.69 2 8 2zm.5 4a.5.5 0 00-1 0v1.5H6a.5.5 0 000 1h1.5V10a.5.5 0 001 0V8.5H10a.5.5 0 000-1H8.5V6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-slash" fill="currentColor" id="cloud-slash" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.112 5.112a3.125 3.125 0 00-.17.613C1.266 6.095 0 7.555 0 9.318 0 11.366 1.708 13 3.781 13H11l-1-1H3.781C2.231 12 1 10.785 1 9.318c0-1.365 1.064-2.513 2.46-2.666l.446-.05v-.447c0-.075.006-.152.018-.231l-.812-.812zm2.55-1.45l-.725-.725A5.512 5.512 0 018 2c2.69 0 4.923 2 5.166 4.579C14.758 6.804 16 8.137 16 9.773a3.2 3.2 0 01-1.516 2.711l-.733-.733C14.498 11.378 15 10.626 15 9.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 4.825 10.328 3 8 3c-.875 0-1.678.26-2.339.661zm7.984 10.692l-12-12 .708-.708 12 12-.707.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-slash-fill" fill="currentColor" id="cloud-slash-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.112 5.112a3.125 3.125 0 00-.17.613C1.266 6.095 0 7.555 0 9.318 0 11.366 1.708 13 3.781 13H11L3.112 5.112zm11.372 7.372L4.937 2.937A5.512 5.512 0 018 2c2.69 0 4.923 2 5.166 4.579C14.758 6.804 16 8.137 16 9.773a3.2 3.2 0 01-1.516 2.711zm-.838 1.87l-12-12 .708-.708 12 12-.707.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-upload" fill="currentColor" id="cloud-upload" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.406 1.342A5.53 5.53 0 018 0c2.69 0 4.923 2 5.166 4.579C14.758 4.804 16 6.137 16 7.773 16 9.569 14.502 11 12.687 11H10a.5.5 0 010-1h2.688C13.979 10 15 8.988 15 7.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 2.825 10.328 1 8 1a4.53 4.53 0 00-2.941 1.1c-.757.652-1.153 1.438-1.153 2.055v.448l-.445.049C2.064 4.805 1 5.952 1 7.318 1 8.785 2.23 10 3.781 10H6a.5.5 0 010 1H3.781C1.708 11 0 9.366 0 7.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383z"/><path fill-rule="evenodd" d="M7.646 4.146a.5.5 0 01.708 0l3 3a.5.5 0 01-.708.708L8.5 5.707V14.5a.5.5 0 01-1 0V5.707L5.354 7.854a.5.5 0 11-.708-.708l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cloud-upload-fill" fill="currentColor" id="cloud-upload-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 0a5.53 5.53 0 00-3.594 1.342c-.766.66-1.321 1.52-1.464 2.383C1.266 4.095 0 5.555 0 7.318 0 9.366 1.708 11 3.781 11H7.5V5.707L5.354 7.854a.5.5 0 11-.708-.708l3-3a.5.5 0 01.708 0l3 3a.5.5 0 01-.708.708L8.5 5.707V11h4.188C14.502 11 16 9.57 16 7.773c0-1.636-1.242-2.969-2.834-3.194C12.923 1.999 10.69 0 8 0zm-.5 14.5V11h1v3.5a.5.5 0 01-1 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-code" fill="currentColor" id="code" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.854 4.146a.5.5 0 010 .708L2.707 8l3.147 3.146a.5.5 0 01-.708.708l-3.5-3.5a.5.5 0 010-.708l3.5-3.5a.5.5 0 01.708 0zm4.292 0a.5.5 0 000 .708L13.293 8l-3.147 3.146a.5.5 0 00.708.708l3.5-3.5a.5.5 0 000-.708l-3.5-3.5a.5.5 0 00-.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-code-slash" fill="currentColor" id="code-slash" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.854 4.146a.5.5 0 010 .708L1.707 8l3.147 3.146a.5.5 0 01-.708.708l-3.5-3.5a.5.5 0 010-.708l3.5-3.5a.5.5 0 01.708 0zm6.292 0a.5.5 0 000 .708L14.293 8l-3.147 3.146a.5.5 0 00.708.708l3.5-3.5a.5.5 0 000-.708l-3.5-3.5a.5.5 0 00-.708 0zm-.999-3.124a.5.5 0 01.33.625l-4 13a.5.5 0 01-.955-.294l4-13a.5.5 0 01.625-.33z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-code-square" fill="currentColor" id="code-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M6.854 4.646a.5.5 0 010 .708L4.207 8l2.647 2.646a.5.5 0 01-.708.708l-3-3a.5.5 0 010-.708l3-3a.5.5 0 01.708 0zm2.292 0a.5.5 0 000 .708L11.793 8l-2.647 2.646a.5.5 0 00.708.708l3-3a.5.5 0 000-.708l-3-3a.5.5 0 00-.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-collection" fill="currentColor" id="collection" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.5 13.5h-13A.5.5 0 011 13V6a.5.5 0 01.5-.5h13a.5.5 0 01.5.5v7a.5.5 0 01-.5.5zm-13 1A1.5 1.5 0 010 13V6a1.5 1.5 0 011.5-1.5h13A1.5 1.5 0 0116 6v7a1.5 1.5 0 01-1.5 1.5h-13zM2 3a.5.5 0 00.5.5h11a.5.5 0 000-1h-11A.5.5 0 002 3zm2-2a.5.5 0 00.5.5h7a.5.5 0 000-1h-7A.5.5 0 004 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-collection-fill" fill="currentColor" id="collection-fill" xmlns="http://www.w3.org/2000/svg"><path d="M0 13a1.5 1.5 0 001.5 1.5h13A1.5 1.5 0 0016 13V6a1.5 1.5 0 00-1.5-1.5h-13A1.5 1.5 0 000 6v7z"/><path fill-rule="evenodd" d="M2 3a.5.5 0 00.5.5h11a.5.5 0 000-1h-11A.5.5 0 002 3zm2-2a.5.5 0 00.5.5h7a.5.5 0 000-1h-7A.5.5 0 004 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-collection-play" fill="currentColor" id="collection-play" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.5 13.5h-13A.5.5 0 011 13V6a.5.5 0 01.5-.5h13a.5.5 0 01.5.5v7a.5.5 0 01-.5.5zm-13 1A1.5 1.5 0 010 13V6a1.5 1.5 0 011.5-1.5h13A1.5 1.5 0 0116 6v7a1.5 1.5 0 01-1.5 1.5h-13zM2 3a.5.5 0 00.5.5h11a.5.5 0 000-1h-11A.5.5 0 002 3zm2-2a.5.5 0 00.5.5h7a.5.5 0 000-1h-7A.5.5 0 004 1z"/><path fill-rule="evenodd" d="M6.258 6.563a.5.5 0 01.507.013l4 2.5a.5.5 0 010 .848l-4 2.5A.5.5 0 016 12V7a.5.5 0 01.258-.437z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-collection-play-fill" fill="currentColor" id="collection-play-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 14.5A1.5 1.5 0 010 13V6a1.5 1.5 0 011.5-1.5h13A1.5 1.5 0 0116 6v7a1.5 1.5 0 01-1.5 1.5h-13zm5.265-7.924A.5.5 0 006 7v5a.5.5 0 00.765.424l4-2.5a.5.5 0 000-.848l-4-2.5zM2 3a.5.5 0 00.5.5h11a.5.5 0 000-1h-11A.5.5 0 002 3zm2-2a.5.5 0 00.5.5h7a.5.5 0 000-1h-7A.5.5 0 004 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-columns" fill="currentColor" id="columns" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15 2H1v12h14V2zM1 1a1 1 0 00-1 1v12a1 1 0 001 1h14a1 1 0 001-1V2a1 1 0 00-1-1H1z"/><path fill-rule="evenodd" d="M7.5 14V2h1v12h-1zm0-8H1V5h6.5v1zm7.5 5H8.5v-1H15v1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-columns-gap" fill="currentColor" id="columns-gap" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 1H1v3h5V1zM1 0a1 1 0 00-1 1v3a1 1 0 001 1h5a1 1 0 001-1V1a1 1 0 00-1-1H1zm14 12h-5v3h5v-3zm-5-1a1 1 0 00-1 1v3a1 1 0 001 1h5a1 1 0 001-1v-3a1 1 0 00-1-1h-5zM6 8H1v7h5V8zM1 7a1 1 0 00-1 1v7a1 1 0 001 1h5a1 1 0 001-1V8a1 1 0 00-1-1H1zm14-6h-5v7h5V1zm-5-1a1 1 0 00-1 1v7a1 1 0 001 1h5a1 1 0 001-1V1a1 1 0 00-1-1h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-command" fill="currentColor" id="command" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 2a1.5 1.5 0 100 3H5V3.5A1.5 1.5 0 003.5 2zM6 5V3.5A2.5 2.5 0 103.5 6H5v4H3.5A2.5 2.5 0 106 12.5V11h4v1.5a2.5 2.5 0 102.5-2.5H11V6h1.5A2.5 2.5 0 1010 3.5V5H6zm4 1H6v4h4V6zm1-1h1.5A1.5 1.5 0 1011 3.5V5zm0 6v1.5a1.5 1.5 0 101.5-1.5H11zm-6 0H3.5A1.5 1.5 0 105 12.5V11z"/></symbol><symbol viewBox="0 0 16 17" class="bi bi-compass" fill="currentColor" id="compass" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 16.016a7.5 7.5 0 001.962-14.74A1 1 0 009 0H7a1 1 0 00-.962 1.276A7.5 7.5 0 008 16.016zm6.5-7.5a6.5 6.5 0 11-13 0 6.5 6.5 0 0113 0z"/><path d="M6.94 7.44l4.95-2.83-2.83 4.95-4.949 2.83 2.828-4.95z"/></symbol><symbol viewBox="0 0 16 17" class="bi bi-compass-fill" fill="currentColor" id="compass-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15.5 8.516a7.5 7.5 0 11-9.462-7.24A1 1 0 017 0h2a1 1 0 01.962 1.276 7.503 7.503 0 015.538 7.24zm-3.61-3.905L6.94 7.439 4.11 12.39l4.95-2.828 2.828-4.95z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cone" fill="currentColor" id="cone" xmlns="http://www.w3.org/2000/svg"><path d="M7.03 1.88c.252-1.01 1.688-1.01 1.94 0l2.905 11.62H14a.5.5 0 010 1H2a.5.5 0 010-1h2.125L7.03 1.88z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cone-striped" fill="currentColor" id="cone-striped" xmlns="http://www.w3.org/2000/svg"><path d="M9.97 4.88l.953 3.811C10.159 8.878 9.14 9 8 9c-1.14 0-2.158-.122-2.923-.309L6.03 4.88C6.635 4.957 7.3 5 8 5s1.365-.043 1.97-.12zm-.245-.978L8.97.88C8.718-.13 7.282-.13 7.03.88L6.275 3.9C6.8 3.965 7.382 4 8 4c.618 0 1.2-.036 1.725-.098zm4.396 8.613a.5.5 0 01.037.96l-6 2a.5.5 0 01-.316 0l-6-2a.5.5 0 01.037-.96l2.391-.598.565-2.257c.862.212 1.964.339 3.165.339s2.303-.127 3.165-.339l.565 2.257 2.391.598z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-controller" fill="currentColor" id="controller" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.119 2.693c.904.19 1.75.495 2.235.98.407.408.779 1.05 1.094 1.772.32.733.599 1.591.805 2.466.206.875.34 1.78.364 2.606.024.815-.059 1.602-.328 2.21a1.42 1.42 0 01-1.445.83c-.636-.067-1.115-.394-1.513-.773a11.307 11.307 0 01-.739-.809c-.126-.147-.25-.291-.368-.422-.728-.804-1.597-1.527-3.224-1.527-1.627 0-2.496.723-3.224 1.527-.119.131-.242.275-.368.422-.243.283-.494.576-.739.81-.398.378-.877.705-1.513.772a1.42 1.42 0 01-1.445-.83c-.27-.608-.352-1.395-.329-2.21.024-.826.16-1.73.365-2.606.206-.875.486-1.733.805-2.466.315-.722.687-1.364 1.094-1.772.486-.485 1.331-.79 2.235-.98.932-.196 2.03-.292 3.119-.292 1.089 0 2.187.096 3.119.292zm-6.032.979c-.877.185-1.469.443-1.733.708-.276.276-.587.783-.885 1.465a13.748 13.748 0 00-.748 2.295 12.351 12.351 0 00-.339 2.406c-.022.755.062 1.368.243 1.776a.42.42 0 00.426.24c.327-.034.61-.199.929-.502.212-.202.4-.423.615-.674.133-.156.276-.323.44-.505C4.861 9.97 5.978 9.026 8 9.026s3.139.943 3.965 1.855c.164.182.307.35.44.505.214.25.403.472.615.674.318.303.601.468.929.503a.42.42 0 00.426-.241c.18-.408.265-1.02.243-1.776a12.354 12.354 0 00-.339-2.406 13.753 13.753 0 00-.748-2.295c-.298-.682-.61-1.19-.885-1.465-.264-.265-.856-.523-1.733-.708-.85-.179-1.877-.27-2.913-.27-1.036 0-2.063.091-2.913.27z"/><path d="M11.5 6.026a.5.5 0 11-1 0 .5.5 0 011 0zm-1 1a.5.5 0 11-1 0 .5.5 0 011 0zm2 0a.5.5 0 11-1 0 .5.5 0 011 0zm-1 1a.5.5 0 11-1 0 .5.5 0 011 0zm-7-2.5h1v3h-1v-3z"/><path d="M3.5 6.526h3v1h-3v-1zM3.051 3.26a.5.5 0 01.354-.613l1.932-.518a.5.5 0 01.258.966l-1.932.518a.5.5 0 01-.612-.354zm9.976 0a.5.5 0 00-.353-.613l-1.932-.518a.5.5 0 10-.259.966l1.932.518a.5.5 0 00.612-.354z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cpu" fill="currentColor" id="cpu" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 0a.5.5 0 01.5.5V2h1V.5a.5.5 0 011 0V2h1V.5a.5.5 0 011 0V2h1V.5a.5.5 0 011 0V2A2.5 2.5 0 0114 4.5h1.5a.5.5 0 010 1H14v1h1.5a.5.5 0 010 1H14v1h1.5a.5.5 0 010 1H14v1h1.5a.5.5 0 010 1H14a2.5 2.5 0 01-2.5 2.5v1.5a.5.5 0 01-1 0V14h-1v1.5a.5.5 0 01-1 0V14h-1v1.5a.5.5 0 01-1 0V14h-1v1.5a.5.5 0 01-1 0V14A2.5 2.5 0 012 11.5H.5a.5.5 0 010-1H2v-1H.5a.5.5 0 010-1H2v-1H.5a.5.5 0 010-1H2v-1H.5a.5.5 0 010-1H2A2.5 2.5 0 014.5 2V.5A.5.5 0 015 0zm-.5 3A1.5 1.5 0 003 4.5v7A1.5 1.5 0 004.5 13h7a1.5 1.5 0 001.5-1.5v-7A1.5 1.5 0 0011.5 3h-7zM5 6.5A1.5 1.5 0 016.5 5h3A1.5 1.5 0 0111 6.5v3A1.5 1.5 0 019.5 11h-3A1.5 1.5 0 015 9.5v-3zM6.5 6a.5.5 0 00-.5.5v3a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-3a.5.5 0 00-.5-.5h-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cpu-fill" fill="currentColor" id="cpu-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.5.5a.5.5 0 00-1 0V2A2.5 2.5 0 002 4.5H.5a.5.5 0 000 1H2v1H.5a.5.5 0 000 1H2v1H.5a.5.5 0 000 1H2v1H.5a.5.5 0 000 1H2A2.5 2.5 0 004.5 14v1.5a.5.5 0 001 0V14h1v1.5a.5.5 0 001 0V14h1v1.5a.5.5 0 001 0V14h1v1.5a.5.5 0 001 0V14a2.5 2.5 0 002.5-2.5h1.5a.5.5 0 000-1H14v-1h1.5a.5.5 0 000-1H14v-1h1.5a.5.5 0 000-1H14v-1h1.5a.5.5 0 000-1H14A2.5 2.5 0 0011.5 2V.5a.5.5 0 00-1 0V2h-1V.5a.5.5 0 00-1 0V2h-1V.5a.5.5 0 00-1 0V2h-1V.5zm1 4.5A1.5 1.5 0 005 6.5v3A1.5 1.5 0 006.5 11h3A1.5 1.5 0 0011 9.5v-3A1.5 1.5 0 009.5 5h-3zm0 1a.5.5 0 00-.5.5v3a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-3a.5.5 0 00-.5-.5h-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-credit-card" fill="currentColor" id="credit-card" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 4a2 2 0 012-2h12a2 2 0 012 2v8a2 2 0 01-2 2H2a2 2 0 01-2-2V4zm2-1a1 1 0 00-1 1v1h14V4a1 1 0 00-1-1H2zm13 4H1v5a1 1 0 001 1h12a1 1 0 001-1V7z"/><path d="M2 10a1 1 0 011-1h1a1 1 0 011 1v1a1 1 0 01-1 1H3a1 1 0 01-1-1v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-credit-card-2-back" fill="currentColor" id="credit-card-2-back" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v8a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/><path d="M11 5.5a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-1zM1 9h14v2H1V9z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-credit-card-2-back-fill" fill="currentColor" id="credit-card-2-back-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 4a2 2 0 012-2h12a2 2 0 012 2v5H0V4zm11.5 1a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h2a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-2z"/><path d="M0 11v1a2 2 0 002 2h12a2 2 0 002-2v-1H0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-credit-card-2-front" fill="currentColor" id="credit-card-2-front" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v8a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/><path d="M2 5.5a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-1z"/><path fill-rule="evenodd" d="M2 8.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5zm3 0a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5zm3 0a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5zm3 0a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-credit-card-2-front-fill" fill="currentColor" id="credit-card-2-front-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 4a2 2 0 012-2h12a2 2 0 012 2v8a2 2 0 01-2 2H2a2 2 0 01-2-2V4zm2.5 1a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h2a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-2zm0 3a.5.5 0 000 1h5a.5.5 0 000-1h-5zm0 2a.5.5 0 000 1h1a.5.5 0 000-1h-1zm3 0a.5.5 0 000 1h1a.5.5 0 000-1h-1zm3 0a.5.5 0 000 1h1a.5.5 0 000-1h-1zm3 0a.5.5 0 000 1h1a.5.5 0 000-1h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-credit-card-fill" fill="currentColor" id="credit-card-fill" xmlns="http://www.w3.org/2000/svg"><path d="M0 4a2 2 0 012-2h12a2 2 0 012 2v1H0V4z"/><path fill-rule="evenodd" d="M0 7v5a2 2 0 002 2h12a2 2 0 002-2V7H0zm3 2a1 1 0 00-1 1v1a1 1 0 001 1h1a1 1 0 001-1v-1a1 1 0 00-1-1H3z"/></symbol><symbol viewBox="0 0 18 18" class="bi bi-crop" fill="currentColor" id="crop" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5.5A.5.5 0 014 1v13h13a.5.5 0 010 1h-2v2a.5.5 0 01-1 0v-2H3.5a.5.5 0 01-.5-.5V4H1a.5.5 0 010-1h2V1a.5.5 0 01.5-.5zm2.5 3a.5.5 0 01.5-.5h8a.5.5 0 01.5.5v8a.5.5 0 01-1 0V4H6.5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cup" fill="currentColor" id="cup" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 2a1 1 0 011-1h11a1 1 0 011 1v1h.5A1.5 1.5 0 0116 4.5v7a1.5 1.5 0 01-1.5 1.5h-.55a2.5 2.5 0 01-2.45 2h-8A2.5 2.5 0 011 12.5V2zm13 10h.5a.5.5 0 00.5-.5v-7a.5.5 0 00-.5-.5H14v8zM13 2H2v10.5A1.5 1.5 0 003.5 14h8a1.5 1.5 0 001.5-1.5V2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cup-fill" fill="currentColor" id="cup-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 2a1 1 0 011-1h11a1 1 0 011 1v1h.5A1.5 1.5 0 0116 4.5v7a1.5 1.5 0 01-1.5 1.5h-.55a2.5 2.5 0 01-2.45 2h-8A2.5 2.5 0 011 12.5V2zm13 10h.5a.5.5 0 00.5-.5v-7a.5.5 0 00-.5-.5H14v8z"/></symbol><symbol viewBox="0 0 16 17" class="bi bi-cup-straw" fill="currentColor" id="cup-straw" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13.964 1.18a.5.5 0 01-.278.65l-2.255.902-.462 2.08c.375.096.714.216.971.368.228.135.56.396.56.82 0 .046-.004.09-.011.132l-.955 9.068a1.28 1.28 0 01-.524.93c-.488.34-1.494.87-3.01.87-1.516 0-2.522-.53-3.01-.87a1.28 1.28 0 01-.524-.93L3.51 6.132A.78.78 0 013.5 6c0-.424.332-.685.56-.82.262-.154.607-.276.99-.372C5.824 4.614 6.867 4.5 8 4.5c.712 0 1.389.045 1.985.127l.527-2.37a.5.5 0 01.302-.355l2.5-1a.5.5 0 01.65.279zM9.768 5.608A13.991 13.991 0 008 5.5c-1.076 0-2.033.11-2.707.278A3.284 3.284 0 004.645 6c.146.073.362.15.648.222C5.967 6.39 6.924 6.5 8 6.5c.571 0 1.109-.03 1.588-.085l.18-.808zm.292 1.756a5.513 5.513 0 001.325-.297l-.845 8.03c-.013.12-.06.185-.102.214-.357.249-1.167.69-2.438.69-1.27 0-2.08-.441-2.438-.69-.041-.029-.09-.094-.102-.214l-.845-8.03c.137.046.283.088.435.126.774.194 1.817.308 2.95.308.742 0 1.445-.049 2.06-.137zm-5.593-1.48s.003.002.005.006l-.005-.006zm7.066 0l-.005.006a.026.026 0 01.005-.006zM11.354 6a3.282 3.282 0 01-.703.235l.1-.446c.264.069.464.142.603.211z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cursor" fill="currentColor" id="cursor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.082 2.182a.5.5 0 01.103.557L8.528 15.467a.5.5 0 01-.917-.007L5.57 10.694.803 8.652a.5.5 0 01-.006-.916l12.728-5.657a.5.5 0 01.556.103zM2.25 8.184l3.897 1.67a.5.5 0 01.262.263l1.67 3.897L12.743 3.52 2.25 8.184z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cursor-fill" fill="currentColor" id="cursor-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.082 2.182a.5.5 0 01.103.557L8.528 15.467a.5.5 0 01-.917-.007L5.57 10.694.803 8.652a.5.5 0 01-.006-.916l12.728-5.657a.5.5 0 01.556.103z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-cursor-text" fill="currentColor" id="cursor-text" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 2a.5.5 0 01.5-.5c.862 0 1.573.287 2.06.566.174.099.321.198.44.286.119-.088.266-.187.44-.286A4.165 4.165 0 0110.5 1.5a.5.5 0 010 1c-.638 0-1.177.213-1.564.434a3.49 3.49 0 00-.436.294V7.5H9a.5.5 0 010 1h-.5v4.272c.1.08.248.187.436.294.387.221.926.434 1.564.434a.5.5 0 010 1 4.165 4.165 0 01-2.06-.566A4.561 4.561 0 018 13.65a4.561 4.561 0 01-.44.285 4.165 4.165 0 01-2.06.566.5.5 0 010-1c.638 0 1.177-.213 1.564-.434.188-.107.335-.214.436-.294V8.5H7a.5.5 0 010-1h.5V3.228a3.49 3.49 0 00-.436-.294A3.166 3.166 0 005.5 2.5.5.5 0 015 2zm3.352 1.355zm-.704 9.29z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dash" fill="currentColor" id="dash" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 8a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7A.5.5 0 014 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dash-circle" fill="currentColor" id="dash-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M4 8a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7A.5.5 0 014 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dash-circle-fill" fill="currentColor" id="dash-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zM4.5 7.5a.5.5 0 000 1h7a.5.5 0 000-1h-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dash-square" fill="currentColor" id="dash-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M4 8a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7A.5.5 0 014 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dash-square-fill" fill="currentColor" id="dash-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm2.5 7.5a.5.5 0 000 1h7a.5.5 0 000-1h-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-diagram-2" fill="currentColor" id="diagram-2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 3.5A1.5 1.5 0 017.5 2h1A1.5 1.5 0 0110 3.5v1A1.5 1.5 0 018.5 6v1H11a.5.5 0 01.5.5v1a.5.5 0 01-1 0V8h-5v.5a.5.5 0 01-1 0v-1A.5.5 0 015 7h2.5V6A1.5 1.5 0 016 4.5v-1zM8.5 5a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1zM3 11.5A1.5 1.5 0 014.5 10h1A1.5 1.5 0 017 11.5v1A1.5 1.5 0 015.5 14h-1A1.5 1.5 0 013 12.5v-1zm1.5-.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zm4.5.5a1.5 1.5 0 011.5-1.5h1a1.5 1.5 0 011.5 1.5v1a1.5 1.5 0 01-1.5 1.5h-1A1.5 1.5 0 019 12.5v-1zm1.5-.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-diagram-2-fill" fill="currentColor" id="diagram-2-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 3.5A1.5 1.5 0 017.5 2h1A1.5 1.5 0 0110 3.5v1A1.5 1.5 0 018.5 6v1H11a.5.5 0 01.5.5v1a.5.5 0 01-1 0V8h-5v.5a.5.5 0 01-1 0v-1A.5.5 0 015 7h2.5V6A1.5 1.5 0 016 4.5v-1zm-3 8A1.5 1.5 0 014.5 10h1A1.5 1.5 0 017 11.5v1A1.5 1.5 0 015.5 14h-1A1.5 1.5 0 013 12.5v-1zm6 0a1.5 1.5 0 011.5-1.5h1a1.5 1.5 0 011.5 1.5v1a1.5 1.5 0 01-1.5 1.5h-1A1.5 1.5 0 019 12.5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-diagram-3" fill="currentColor" id="diagram-3" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 3.5A1.5 1.5 0 017.5 2h1A1.5 1.5 0 0110 3.5v1A1.5 1.5 0 018.5 6v1H14a.5.5 0 01.5.5v1a.5.5 0 01-1 0V8h-5v.5a.5.5 0 01-1 0V8h-5v.5a.5.5 0 01-1 0v-1A.5.5 0 012 7h5.5V6A1.5 1.5 0 016 4.5v-1zM8.5 5a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1zM0 11.5A1.5 1.5 0 011.5 10h1A1.5 1.5 0 014 11.5v1A1.5 1.5 0 012.5 14h-1A1.5 1.5 0 010 12.5v-1zm1.5-.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zm4.5.5A1.5 1.5 0 017.5 10h1a1.5 1.5 0 011.5 1.5v1A1.5 1.5 0 018.5 14h-1A1.5 1.5 0 016 12.5v-1zm1.5-.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zm4.5.5a1.5 1.5 0 011.5-1.5h1a1.5 1.5 0 011.5 1.5v1a1.5 1.5 0 01-1.5 1.5h-1a1.5 1.5 0 01-1.5-1.5v-1zm1.5-.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-diagram-3-fill" fill="currentColor" id="diagram-3-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 3.5A1.5 1.5 0 017.5 2h1A1.5 1.5 0 0110 3.5v1A1.5 1.5 0 018.5 6v1H14a.5.5 0 01.5.5v1a.5.5 0 01-1 0V8h-5v.5a.5.5 0 01-1 0V8h-5v.5a.5.5 0 01-1 0v-1A.5.5 0 012 7h5.5V6A1.5 1.5 0 016 4.5v-1zm-6 8A1.5 1.5 0 011.5 10h1A1.5 1.5 0 014 11.5v1A1.5 1.5 0 012.5 14h-1A1.5 1.5 0 010 12.5v-1zm6 0A1.5 1.5 0 017.5 10h1a1.5 1.5 0 011.5 1.5v1A1.5 1.5 0 018.5 14h-1A1.5 1.5 0 016 12.5v-1zm6 0a1.5 1.5 0 011.5-1.5h1a1.5 1.5 0 011.5 1.5v1a1.5 1.5 0 01-1.5 1.5h-1a1.5 1.5 0 01-1.5-1.5v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-diamond" fill="currentColor" id="diamond" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.95.435c.58-.58 1.52-.58 2.1 0l6.515 6.516c.58.58.58 1.519 0 2.098L9.05 15.565c-.58.58-1.519.58-2.098 0L.435 9.05a1.482 1.482 0 010-2.098L6.95.435zm1.4.7a.495.495 0 00-.7 0L1.134 7.65a.495.495 0 000 .7l6.516 6.516a.495.495 0 00.7 0l6.516-6.516a.495.495 0 000-.7L8.35 1.134z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-diamond-fill" fill="currentColor" id="diamond-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.95.435c.58-.58 1.52-.58 2.1 0l6.515 6.516c.58.58.58 1.519 0 2.098L9.05 15.565c-.58.58-1.519.58-2.098 0L.435 9.05a1.482 1.482 0 010-2.098L6.95.435z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-diamond-half" fill="currentColor" id="diamond-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.05.435c-.58-.58-1.52-.58-2.1 0L.436 6.95c-.58.58-.58 1.519 0 2.098l6.516 6.516c.58.58 1.519.58 2.098 0l6.516-6.516c.58-.58.58-1.519 0-2.098L9.05.435zM8 .989c.127 0 .253.049.35.145l6.516 6.516a.495.495 0 010 .7L8.35 14.866a.493.493 0 01-.35.145V.989z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-1" fill="currentColor" id="dice-1" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13 1H3a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2V3a2 2 0 00-2-2zM3 0a3 3 0 00-3 3v10a3 3 0 003 3h10a3 3 0 003-3V3a3 3 0 00-3-3H3z"/><circle cx="8" cy="8" r="1.5"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-1-fill" fill="currentColor" id="dice-1-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 0a3 3 0 00-3 3v10a3 3 0 003 3h10a3 3 0 003-3V3a3 3 0 00-3-3H3zm5 9.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-2" fill="currentColor" id="dice-2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13 1H3a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2V3a2 2 0 00-2-2zM3 0a3 3 0 00-3 3v10a3 3 0 003 3h10a3 3 0 003-3V3a3 3 0 00-3-3H3z"/><circle cx="4" cy="4" r="1.5"/><circle cx="12" cy="12" r="1.5"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-2-fill" fill="currentColor" id="dice-2-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 3a3 3 0 013-3h10a3 3 0 013 3v10a3 3 0 01-3 3H3a3 3 0 01-3-3V3zm5.5 1a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm6.5 9.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-3" fill="currentColor" id="dice-3" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13 1H3a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2V3a2 2 0 00-2-2zM3 0a3 3 0 00-3 3v10a3 3 0 003 3h10a3 3 0 003-3V3a3 3 0 00-3-3H3z"/><circle cx="4" cy="4" r="1.5"/><circle cx="12" cy="12" r="1.5"/><circle cx="8" cy="8" r="1.5"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-3-fill" fill="currentColor" id="dice-3-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 0a3 3 0 00-3 3v10a3 3 0 003 3h10a3 3 0 003-3V3a3 3 0 00-3-3H3zm2.5 4a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm8 8a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM8 9.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-4" fill="currentColor" id="dice-4" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13 1H3a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2V3a2 2 0 00-2-2zM3 0a3 3 0 00-3 3v10a3 3 0 003 3h10a3 3 0 003-3V3a3 3 0 00-3-3H3z"/><circle cx="4" cy="4" r="1.5"/><circle cx="12" cy="4" r="1.5"/><circle cx="12" cy="12" r="1.5"/><circle cx="4" cy="12" r="1.5"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-4-fill" fill="currentColor" id="dice-4-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 0a3 3 0 00-3 3v10a3 3 0 003 3h10a3 3 0 003-3V3a3 3 0 00-3-3H3zm1 5.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm8 0a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm1.5 6.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM4 13.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-5" fill="currentColor" id="dice-5" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13 1H3a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2V3a2 2 0 00-2-2zM3 0a3 3 0 00-3 3v10a3 3 0 003 3h10a3 3 0 003-3V3a3 3 0 00-3-3H3z"/><circle cx="4" cy="4" r="1.5"/><circle cx="12" cy="4" r="1.5"/><circle cx="12" cy="12" r="1.5"/><circle cx="4" cy="12" r="1.5"/><circle cx="8" cy="8" r="1.5"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-5-fill" fill="currentColor" id="dice-5-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 0a3 3 0 00-3 3v10a3 3 0 003 3h10a3 3 0 003-3V3a3 3 0 00-3-3H3zm2.5 4a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm8 0a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM12 13.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3zM5.5 12a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM8 9.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-6" fill="currentColor" id="dice-6" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13 1H3a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2V3a2 2 0 00-2-2zM3 0a3 3 0 00-3 3v10a3 3 0 003 3h10a3 3 0 003-3V3a3 3 0 00-3-3H3z"/><circle cx="4" cy="4" r="1.5"/><circle cx="12" cy="4" r="1.5"/><circle cx="12" cy="12" r="1.5"/><circle cx="12" cy="8" r="1.5"/><circle cx="4" cy="12" r="1.5"/><circle cx="4" cy="8" r="1.5"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dice-6-fill" fill="currentColor" id="dice-6-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 0a3 3 0 00-3 3v10a3 3 0 003 3h10a3 3 0 003-3V3a3 3 0 00-3-3H3zm1 5.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm8 0a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm1.5 6.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM12 9.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3zM5.5 12a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM4 9.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-display" fill="currentColor" id="display" xmlns="http://www.w3.org/2000/svg"><path d="M5.75 13.5c.167-.333.25-.833.25-1.5h4c0 .667.083 1.167.25 1.5H11a.5.5 0 010 1H5a.5.5 0 010-1h.75z"/><path fill-rule="evenodd" d="M13.991 3H2c-.325 0-.502.078-.602.145a.758.758 0 00-.254.302A1.46 1.46 0 001 4.01V10c0 .325.078.502.145.602.07.105.17.188.302.254a1.464 1.464 0 00.538.143L2.01 11H14c.325 0 .502-.078.602-.145a.758.758 0 00.254-.302 1.464 1.464 0 00.143-.538L15 9.99V4c0-.325-.078-.502-.145-.602a.757.757 0 00-.302-.254A1.46 1.46 0 0013.99 3zM14 2H2C0 2 0 4 0 4v6c0 2 2 2 2 2h12c2 0 2-2 2-2V4c0-2-2-2-2-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-display-fill" fill="currentColor" id="display-fill" xmlns="http://www.w3.org/2000/svg"><path d="M6 12c0 .667-.083 1.167-.25 1.5H5a.5.5 0 000 1h6a.5.5 0 000-1h-.75c-.167-.333-.25-.833-.25-1.5h4c2 0 2-2 2-2V4c0-2-2-2-2-2H2C0 2 0 4 0 4v6c0 2 2 2 2 2h4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-distribute-horizontal" fill="currentColor" id="distribute-horizontal" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.5 1a.5.5 0 00-.5.5v13a.5.5 0 001 0v-13a.5.5 0 00-.5-.5zm-13 0a.5.5 0 00-.5.5v13a.5.5 0 001 0v-13a.5.5 0 00-.5-.5z"/><path d="M6 13a1 1 0 001 1h2a1 1 0 001-1V3a1 1 0 00-1-1H7a1 1 0 00-1 1v10z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-distribute-vertical" fill="currentColor" id="distribute-vertical" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 1.5a.5.5 0 00.5.5h13a.5.5 0 000-1h-13a.5.5 0 00-.5.5zm0 13a.5.5 0 00.5.5h13a.5.5 0 000-1h-13a.5.5 0 00-.5.5z"/><path d="M2 7a1 1 0 011-1h10a1 1 0 011 1v2a1 1 0 01-1 1H3a1 1 0 01-1-1V7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-door-closed" fill="currentColor" id="door-closed" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 2a1 1 0 011-1h8a1 1 0 011 1v13h1.5a.5.5 0 010 1h-13a.5.5 0 010-1H3V2zm1 13h8V2H4v13z"/><path d="M9 9a1 1 0 102 0 1 1 0 00-2 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-door-closed-fill" fill="currentColor" id="door-closed-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 1a1 1 0 00-1 1v13H1.5a.5.5 0 000 1h13a.5.5 0 000-1H13V2a1 1 0 00-1-1H4zm2 9a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-door-open" fill="currentColor" id="door-open" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 15.5a.5.5 0 01.5-.5h13a.5.5 0 010 1h-13a.5.5 0 01-.5-.5zM11.5 2H11V1h.5A1.5 1.5 0 0113 2.5V15h-1V2.5a.5.5 0 00-.5-.5z"/><path fill-rule="evenodd" d="M10.828.122A.5.5 0 0111 .5V15h-1V1.077l-6 .857V15H3V1.5a.5.5 0 01.43-.495l7-1a.5.5 0 01.398.117z"/><path d="M8 9c0 .552.224 1 .5 1s.5-.448.5-1-.224-1-.5-1-.5.448-.5 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-door-open-fill" fill="currentColor" id="door-open-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 15a.5.5 0 000 1h13a.5.5 0 000-1H13V2.5A1.5 1.5 0 0011.5 1H11V.5a.5.5 0 00-.57-.495l-7 1A.5.5 0 003 1.5V15H1.5zM11 2v13h1V2.5a.5.5 0 00-.5-.5H11zm-2.5 8c-.276 0-.5-.448-.5-1s.224-1 .5-1 .5.448.5 1-.224 1-.5 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-dot" fill="currentColor" id="dot" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-download" fill="currentColor" id="download" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.5 9.9a.5.5 0 01.5.5v2.5a1 1 0 001 1h12a1 1 0 001-1v-2.5a.5.5 0 011 0v2.5a2 2 0 01-2 2H2a2 2 0 01-2-2v-2.5a.5.5 0 01.5-.5z"/><path fill-rule="evenodd" d="M7.646 11.854a.5.5 0 00.708 0l3-3a.5.5 0 00-.708-.708L8.5 10.293V1.5a.5.5 0 00-1 0v8.793L5.354 8.146a.5.5 0 10-.708.708l3 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-droplet" fill="currentColor" id="droplet" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.21.8C7.69.295 8 0 8 0c.109.363.234.708.371 1.038.812 1.946 2.073 3.35 3.197 4.6C12.878 7.096 14 8.345 14 10a6 6 0 01-12 0C2 6.668 5.58 2.517 7.21.8zm.413 1.021A31.25 31.25 0 005.794 3.99c-.726.95-1.436 2.008-1.96 3.07C3.304 8.133 3 9.138 3 10a5 5 0 0010 0c0-1.201-.796-2.157-2.181-3.7l-.03-.032C9.75 5.11 8.5 3.72 7.623 1.82z"/><path fill-rule="evenodd" d="M4.553 7.776c.82-1.641 1.717-2.753 2.093-3.13l.708.708c-.29.29-1.128 1.311-1.907 2.87l-.894-.448z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-droplet-fill" fill="currentColor" id="droplet-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 16a6 6 0 006-6c0-1.655-1.122-2.904-2.432-4.362C10.254 4.176 8.75 2.503 8 0c0 0-6 5.686-6 10a6 6 0 006 6zM6.646 4.646c-.376.377-1.272 1.489-2.093 3.13l.894.448c.78-1.559 1.616-2.58 1.907-2.87l-.708-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-droplet-half" fill="currentColor" id="droplet-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.21.8C7.69.295 8 0 8 0c.109.363.234.708.371 1.038.812 1.946 2.073 3.35 3.197 4.6C12.878 7.096 14 8.345 14 10a6 6 0 01-12 0C2 6.668 5.58 2.517 7.21.8zm.413 1.021A31.25 31.25 0 005.794 3.99c-.726.95-1.436 2.008-1.96 3.07C3.304 8.133 3 9.138 3 10c0 0 2.5 1.5 5 .5s5-.5 5-.5c0-1.201-.796-2.157-2.181-3.7l-.03-.032C9.75 5.11 8.5 3.72 7.623 1.82z"/><path fill-rule="evenodd" d="M4.553 7.776c.82-1.641 1.717-2.753 2.093-3.13l.708.708c-.29.29-1.128 1.311-1.907 2.87l-.894-.448z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-earbuds" fill="currentColor" id="earbuds" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.825 4.138c.596 2.141-.36 3.593-2.389 4.117a4.432 4.432 0 01-2.018.054c-.048-.01.9 2.778 1.522 4.61l.41 1.205a.52.52 0 01-.346.659l-.593.19a.548.548 0 01-.69-.34L.184 6.99c-.696-2.137.662-4.309 2.564-4.8 2.029-.523 3.402 0 4.076 1.948zm-.868 2.221c.43-.112.561-.993.292-1.969-.269-.975-.836-1.675-1.266-1.563-.43.112-.561.994-.292 1.969.269.975.836 1.675 1.266 1.563zm3.218-2.221c-.596 2.141.36 3.593 2.389 4.117a4.434 4.434 0 002.018.054c.048-.01-.9 2.778-1.522 4.61l-.41 1.205a.52.52 0 00.346.659l.593.19c.289.092.6-.06.69-.34l2.536-7.643c.696-2.137-.662-4.309-2.564-4.8-2.029-.523-3.402 0-4.076 1.948zm.868 2.221c-.43-.112-.561-.993-.292-1.969.269-.975.836-1.675 1.266-1.563.43.112.561.994.292 1.969-.269.975-.836 1.675-1.266 1.563z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-easel" fill="currentColor" id="easel" xmlns="http://www.w3.org/2000/svg"><path d="M8.473.337a.5.5 0 00-.946 0L6.954 2h2.092L8.473.337zM12.15 11h-1.058l1.435 4.163a.5.5 0 00.946-.326L12.15 11zM8.5 11h-1v2.5a.5.5 0 001 0V11zm-3.592 0H3.85l-1.323 3.837a.5.5 0 10.946.326L4.908 11z"/><path fill-rule="evenodd" d="M14 3H2v7h12V3zM2 2a1 1 0 00-1 1v7a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-easel-fill" fill="currentColor" id="easel-fill" xmlns="http://www.w3.org/2000/svg"><path d="M8.473.337a.5.5 0 00-.946 0L6.954 2h2.092L8.473.337zM12.15 11h-1.058l1.435 4.163a.5.5 0 00.946-.326L12.15 11zM8.5 11h-1v2.5a.5.5 0 001 0V11zm-3.592 0H3.85l-1.323 3.837a.5.5 0 10.946.326L4.908 11zM1 3a1 1 0 011-1h12a1 1 0 011 1v7a1 1 0 01-1 1H2a1 1 0 01-1-1V3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-egg" fill="currentColor" id="egg" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15a5 5 0 005-5c0-1.956-.69-4.286-1.742-6.12-.524-.913-1.112-1.658-1.704-2.164C8.956 1.206 8.428 1 8 1c-.428 0-.956.206-1.554.716-.592.506-1.18 1.251-1.704 2.164C3.69 5.714 3 8.044 3 10a5 5 0 005 5zm0 1a6 6 0 006-6c0-4.314-3-10-6-10S2 5.686 2 10a6 6 0 006 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-egg-fill" fill="currentColor" id="egg-fill" xmlns="http://www.w3.org/2000/svg"><path d="M14 10a6 6 0 01-12 0C2 5.686 5 0 8 0s6 5.686 6 10z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-egg-fried" fill="currentColor" id="egg-fried" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13.665 6.113a1 1 0 01-.667-.977L13 5a4 4 0 00-6.483-3.136 1 1 0 01-.8.2 4 4 0 00-3.693 6.61 1 1 0 01.2 1 4 4 0 006.67 4.087 1 1 0 011.262-.152 2.5 2.5 0 003.715-2.905 1 1 0 01.341-1.113 2.001 2.001 0 00-.547-3.478zM14 5c0 .057 0 .113-.003.17a3.001 3.001 0 01.822 5.216 3.5 3.5 0 01-5.201 4.065 5 5 0 01-8.336-5.109A5 5 0 015.896 1.08 5 5 0 0114 5z"/><circle cx="8" cy="8" r="3"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-eject" fill="currentColor" id="eject" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.27 1.047a1 1 0 011.46 0l6.345 6.77c.6.638.146 1.683-.73 1.683H1.656C.78 9.5.326 8.455.926 7.816L7.27 1.047zM14.346 8.5L8 1.731 1.654 8.5h12.692zM.5 11.5a1 1 0 011-1h13a1 1 0 011 1v1a1 1 0 01-1 1h-13a1 1 0 01-1-1v-1zm14 0h-13v1h13v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-eject-fill" fill="currentColor" id="eject-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.27 1.047a1 1 0 011.46 0l6.345 6.77c.6.638.146 1.683-.73 1.683H1.656C.78 9.5.326 8.455.926 7.816L7.27 1.047zM.5 11.5a1 1 0 011-1h13a1 1 0 011 1v1a1 1 0 01-1 1h-13a1 1 0 01-1-1v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-emoji-angry" fill="currentColor" id="emoji-angry" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M4.285 12.433a.5.5 0 00.683-.183A3.498 3.498 0 018 10.5c1.295 0 2.426.703 3.032 1.75a.5.5 0 00.866-.5A4.498 4.498 0 008 9.5a4.5 4.5 0 00-3.898 2.25.5.5 0 00.183.683z"/><path d="M7 6.5C7 7.328 6.552 8 6 8s-1-.672-1-1.5S5.448 5 6 5s1 .672 1 1.5zm4 0c0 .828-.448 1.5-1 1.5s-1-.672-1-1.5S9.448 5 10 5s1 .672 1 1.5z"/><path fill-rule="evenodd" d="M4.053 4.276a.5.5 0 01.67-.223l2 1a.5.5 0 11-.447.894l-2-1a.5.5 0 01-.223-.67zm7.894 0a.5.5 0 00-.67-.223l-2 1a.5.5 0 10.447.894l2-1a.5.5 0 00.223-.67z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-emoji-dizzy" fill="currentColor" id="emoji-dizzy" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M9.146 5.146a.5.5 0 01.708 0l.646.647.646-.647a.5.5 0 01.708.708l-.647.646.647.646a.5.5 0 01-.708.708l-.646-.647-.646.647a.5.5 0 11-.708-.708l.647-.646-.647-.646a.5.5 0 010-.708zm-5 0a.5.5 0 01.708 0l.646.647.646-.647a.5.5 0 11.708.708l-.647.646.647.646a.5.5 0 11-.708.708L5.5 7.207l-.646.647a.5.5 0 11-.708-.708l.647-.646-.647-.646a.5.5 0 010-.708z"/><path d="M10 11a2 2 0 11-4 0 2 2 0 014 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-emoji-expressionless" fill="currentColor" id="emoji-expressionless" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M4 10.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5zm5 0a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-emoji-frown" fill="currentColor" id="emoji-frown" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M4.285 12.433a.5.5 0 00.683-.183A3.498 3.498 0 018 10.5c1.295 0 2.426.703 3.032 1.75a.5.5 0 00.866-.5A4.498 4.498 0 008 9.5a4.5 4.5 0 00-3.898 2.25.5.5 0 00.183.683z"/><path d="M7 6.5C7 7.328 6.552 8 6 8s-1-.672-1-1.5S5.448 5 6 5s1 .672 1 1.5zm4 0c0 .828-.448 1.5-1 1.5s-1-.672-1-1.5S9.448 5 10 5s1 .672 1 1.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-emoji-laughing" fill="currentColor" id="emoji-laughing" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M12.331 9.5a1 1 0 010 1A4.998 4.998 0 018 13a4.998 4.998 0 01-4.33-2.5A1 1 0 014.535 9h6.93a1 1 0 01.866.5z"/><path d="M7 6.5c0 .828-.448 0-1 0s-1 .828-1 0S5.448 5 6 5s1 .672 1 1.5zm4 0c0 .828-.448 0-1 0s-1 .828-1 0S9.448 5 10 5s1 .672 1 1.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-emoji-neutral" fill="currentColor" id="emoji-neutral" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M4 10.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5z"/><path d="M7 6.5C7 7.328 6.552 8 6 8s-1-.672-1-1.5S5.448 5 6 5s1 .672 1 1.5zm4 0c0 .828-.448 1.5-1 1.5s-1-.672-1-1.5S9.448 5 10 5s1 .672 1 1.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-emoji-smile" fill="currentColor" id="emoji-smile" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M4.285 9.567a.5.5 0 01.683.183A3.498 3.498 0 008 11.5a3.498 3.498 0 003.032-1.75.5.5 0 11.866.5A4.498 4.498 0 018 12.5a4.498 4.498 0 01-3.898-2.25.5.5 0 01.183-.683z"/><path d="M7 6.5C7 7.328 6.552 8 6 8s-1-.672-1-1.5S5.448 5 6 5s1 .672 1 1.5zm4 0c0 .828-.448 1.5-1 1.5s-1-.672-1-1.5S9.448 5 10 5s1 .672 1 1.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-emoji-smile-upside-down" fill="currentColor" id="emoji-smile-upside-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a7 7 0 110 14A7 7 0 018 1zm0-1a8 8 0 110 16A8 8 0 018 0z"/><path fill-rule="evenodd" d="M4.285 6.433a.5.5 0 00.683-.183A3.498 3.498 0 018 4.5c1.295 0 2.426.703 3.032 1.75a.5.5 0 00.866-.5A4.498 4.498 0 008 3.5a4.5 4.5 0 00-3.898 2.25.5.5 0 00.183.683z"/><path d="M7 9.5C7 8.672 6.552 8 6 8s-1 .672-1 1.5.448 1.5 1 1.5 1-.672 1-1.5zm4 0c0-.828-.448-1.5-1-1.5s-1 .672-1 1.5.448 1.5 1 1.5 1-.672 1-1.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-emoji-sunglasses" fill="currentColor" id="emoji-sunglasses" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M4.285 9.567a.5.5 0 01.683.183A3.498 3.498 0 008 11.5a3.498 3.498 0 003.032-1.75.5.5 0 11.866.5A4.498 4.498 0 018 12.5a4.498 4.498 0 01-3.898-2.25.5.5 0 01.183-.683zM6.5 6.497V6.5h-1c0-.568.447-.947.862-1.154C6.807 5.123 7.387 5 8 5s1.193.123 1.638.346c.415.207.862.586.862 1.154h-1v-.003l-.003-.01a.213.213 0 00-.036-.053.86.86 0 00-.27-.194C8.91 6.1 8.49 6 8 6c-.491 0-.912.1-1.19.24a.86.86 0 00-.271.194.213.213 0 00-.036.054l-.003.01z"/><path d="M2.31 5.243A1 1 0 013.28 4H6a1 1 0 011 1v1a2 2 0 01-2 2h-.438a2 2 0 01-1.94-1.515L2.31 5.243zM9 5a1 1 0 011-1h2.72a1 1 0 01.97 1.243l-.311 1.242A2 2 0 0111.439 8H11a2 2 0 01-2-2V5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-envelope" fill="currentColor" id="envelope" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 4a2 2 0 012-2h12a2 2 0 012 2v8a2 2 0 01-2 2H2a2 2 0 01-2-2V4zm2-1a1 1 0 00-1 1v.217l7 4.2 7-4.2V4a1 1 0 00-1-1H2zm13 2.383l-4.758 2.855L15 11.114v-5.73zm-.034 6.878L9.271 8.82 8 9.583 6.728 8.82l-5.694 3.44A1 1 0 002 13h12a1 1 0 00.966-.739zM1 11.114l4.758-2.876L1 5.383v5.73z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-envelope-fill" fill="currentColor" id="envelope-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.05 3.555A2 2 0 012 2h12a2 2 0 011.95 1.555L8 8.414.05 3.555zM0 4.697v7.104l5.803-3.558L0 4.697zM6.761 8.83l-6.57 4.027A2 2 0 002 14h12a2 2 0 001.808-1.144l-6.57-4.027L8 9.586l-1.239-.757zm3.436-.586L16 11.801V4.697l-5.803 3.546z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-envelope-open" fill="currentColor" id="envelope-open" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.47 1.318a1 1 0 00-.94 0l-6 3.2A1 1 0 001 5.4v.818l5.724 3.465L8 8.917l1.276.766L15 6.218V5.4a1 1 0 00-.53-.882l-6-3.2zM15 7.388l-4.754 2.877L15 13.117v-5.73zm-.035 6.874L8 10.083l-6.965 4.18A1 1 0 002 15h12a1 1 0 00.965-.738zM1 13.117l4.754-2.852L1 7.387v5.73zM7.059.435a2 2 0 011.882 0l6 3.2A2 2 0 0116 5.4V14a2 2 0 01-2 2H2a2 2 0 01-2-2V5.4a2 2 0 011.059-1.765l6-3.2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-envelope-open-fill" fill="currentColor" id="envelope-open-fill" xmlns="http://www.w3.org/2000/svg"><path d="M8.941.435a2 2 0 00-1.882 0l-6 3.2A2 2 0 000 5.4v.313l6.709 3.933L8 8.928l1.291.717L16 5.715V5.4a2 2 0 00-1.059-1.765l-6-3.2zM16 6.873l-5.693 3.337L16 13.372v-6.5zm-.059 7.611L8 10.072.059 14.484A2 2 0 002 16h12a2 2 0 001.941-1.516zM0 13.373l5.693-3.163L0 6.873v6.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-exclamation" fill="currentColor" id="exclamation" xmlns="http://www.w3.org/2000/svg"><path d="M7.002 11a1 1 0 112 0 1 1 0 01-2 0zM7.1 4.995a.905.905 0 111.8 0l-.35 3.507a.552.552 0 01-1.1 0L7.1 4.995z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-exclamation-circle" fill="currentColor" id="exclamation-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path d="M7.002 11a1 1 0 112 0 1 1 0 01-2 0zM7.1 4.995a.905.905 0 111.8 0l-.35 3.507a.552.552 0 01-1.1 0L7.1 4.995z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-exclamation-circle-fill" fill="currentColor" id="exclamation-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zM8 4a.905.905 0 00-.9.995l.35 3.507a.552.552 0 001.1 0l.35-3.507A.905.905 0 008 4zm.002 6a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-exclamation-diamond" fill="currentColor" id="exclamation-diamond" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.95.435c.58-.58 1.52-.58 2.1 0l6.515 6.516c.58.58.58 1.519 0 2.098L9.05 15.565c-.58.58-1.519.58-2.098 0L.435 9.05a1.482 1.482 0 010-2.098L6.95.435zm1.4.7a.495.495 0 00-.7 0L1.134 7.65a.495.495 0 000 .7l6.516 6.516a.495.495 0 00.7 0l6.516-6.516a.495.495 0 000-.7L8.35 1.134z"/><path d="M7.002 11a1 1 0 112 0 1 1 0 01-2 0zM7.1 4.995a.905.905 0 111.8 0l-.35 3.507a.552.552 0 01-1.1 0L7.1 4.995z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-exclamation-diamond-fill" fill="currentColor" id="exclamation-diamond-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.05.435c-.58-.58-1.52-.58-2.1 0L.436 6.95c-.58.58-.58 1.519 0 2.098l6.516 6.516c.58.58 1.519.58 2.098 0l6.516-6.516c.58-.58.58-1.519 0-2.098L9.05.435zM8 4a.905.905 0 00-.9.995l.35 3.507a.552.552 0 001.1 0l.35-3.507A.905.905 0 008 4zm.002 6a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-exclamation-octagon" fill="currentColor" id="exclamation-octagon" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.54.146A.5.5 0 014.893 0h6.214a.5.5 0 01.353.146l4.394 4.394a.5.5 0 01.146.353v6.214a.5.5 0 01-.146.353l-4.394 4.394a.5.5 0 01-.353.146H4.893a.5.5 0 01-.353-.146L.146 11.46A.5.5 0 010 11.107V4.893a.5.5 0 01.146-.353L4.54.146zM5.1 1L1 5.1v5.8L5.1 15h5.8l4.1-4.1V5.1L10.9 1H5.1z"/><path d="M7.002 11a1 1 0 112 0 1 1 0 01-2 0zM7.1 4.995a.905.905 0 111.8 0l-.35 3.507a.552.552 0 01-1.1 0L7.1 4.995z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-exclamation-octagon-fill" fill="currentColor" id="exclamation-octagon-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.46.146A.5.5 0 0011.107 0H4.893a.5.5 0 00-.353.146L.146 4.54A.5.5 0 000 4.893v6.214a.5.5 0 00.146.353l4.394 4.394a.5.5 0 00.353.146h6.214a.5.5 0 00.353-.146l4.394-4.394a.5.5 0 00.146-.353V4.893a.5.5 0 00-.146-.353L11.46.146zM8 4a.905.905 0 00-.9.995l.35 3.507a.552.552 0 001.1 0l.35-3.507A.905.905 0 008 4zm.002 6a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-exclamation-square" fill="currentColor" id="exclamation-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path d="M7.002 11a1 1 0 112 0 1 1 0 01-2 0zM7.1 4.995a.905.905 0 111.8 0l-.35 3.507a.552.552 0 01-1.1 0L7.1 4.995z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-exclamation-square-fill" fill="currentColor" id="exclamation-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm6 4a.905.905 0 00-.9.995l.35 3.507a.552.552 0 001.1 0l.35-3.507A.905.905 0 008 4zm.002 6a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 17 16" class="bi bi-exclamation-triangle" fill="currentColor" id="exclamation-triangle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.938 2.016a.146.146 0 00-.054.057L1.027 13.74a.176.176 0 00-.002.183c.016.03.037.05.054.06.015.01.034.017.066.017h13.713a.12.12 0 00.066-.017.163.163 0 00.055-.06.176.176 0 00-.003-.183L8.12 2.073a.146.146 0 00-.054-.057A.13.13 0 008.002 2a.13.13 0 00-.064.016zm1.044-.45a1.13 1.13 0 00-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566z"/><path d="M7.002 12a1 1 0 112 0 1 1 0 01-2 0zM7.1 5.995a.905.905 0 111.8 0l-.35 3.507a.552.552 0 01-1.1 0L7.1 5.995z"/></symbol><symbol viewBox="0 0 17 16" class="bi bi-exclamation-triangle-fill" fill="currentColor" id="exclamation-triangle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.982 1.566a1.13 1.13 0 00-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566zM8 5a.905.905 0 00-.9.995l.35 3.507a.552.552 0 001.1 0l.35-3.507A.905.905 0 008 5zm.002 6a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-exclude" fill="currentColor" id="exclude" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h8a2 2 0 012 2v2h2a2 2 0 012 2v8a2 2 0 01-2 2H6a2 2 0 01-2-2v-2H2a2 2 0 01-2-2V2zm12 2v7a1 1 0 01-1 1H4V5a1 1 0 011-1h7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-eye" fill="currentColor" id="eye" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.134 13.134 0 001.66 2.043C4.12 11.332 5.88 12.5 8 12.5c2.12 0 3.879-1.168 5.168-2.457A13.134 13.134 0 0014.828 8a13.133 13.133 0 00-1.66-2.043C11.879 4.668 10.119 3.5 8 3.5c-2.12 0-3.879 1.168-5.168 2.457A13.133 13.133 0 001.172 8z"/><path fill-rule="evenodd" d="M8 5.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM4.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-eye-fill" fill="currentColor" id="eye-fill" xmlns="http://www.w3.org/2000/svg"><path d="M10.5 8a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z"/><path fill-rule="evenodd" d="M0 8s3-5.5 8-5.5S16 8 16 8s-3 5.5-8 5.5S0 8 0 8zm8 3.5a3.5 3.5 0 100-7 3.5 3.5 0 000 7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-eye-slash" fill="currentColor" id="eye-slash" xmlns="http://www.w3.org/2000/svg"><path d="M13.359 11.238C15.06 9.72 16 8 16 8s-3-5.5-8-5.5a7.028 7.028 0 00-2.79.588l.77.771A5.944 5.944 0 018 3.5c2.12 0 3.879 1.168 5.168 2.457A13.134 13.134 0 0114.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755-.165.165-.337.328-.517.486l.708.709z"/><path d="M11.297 9.176a3.5 3.5 0 00-4.474-4.474l.823.823a2.5 2.5 0 012.829 2.829l.822.822zm-2.943 1.299l.822.822a3.5 3.5 0 01-4.474-4.474l.823.823a2.5 2.5 0 002.829 2.829z"/><path d="M3.35 5.47c-.18.16-.353.322-.518.487A13.134 13.134 0 001.172 8l.195.288c.335.48.83 1.12 1.465 1.755C4.121 11.332 5.881 12.5 8 12.5c.716 0 1.39-.133 2.02-.36l.77.772A7.029 7.029 0 018 13.5C3 13.5 0 8 0 8s.939-1.721 2.641-3.238l.708.709z"/><path fill-rule="evenodd" d="M13.646 14.354l-12-12 .708-.708 12 12-.708.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-eye-slash-fill" fill="currentColor" id="eye-slash-fill" xmlns="http://www.w3.org/2000/svg"><path d="M10.79 12.912l-1.614-1.615a3.5 3.5 0 01-4.474-4.474l-2.06-2.06C.938 6.278 0 8 0 8s3 5.5 8 5.5a7.029 7.029 0 002.79-.588zM5.21 3.088A7.028 7.028 0 018 2.5c5 0 8 5.5 8 5.5s-.939 1.721-2.641 3.238l-2.062-2.062a3.5 3.5 0 00-4.474-4.474L5.21 3.089z"/><path d="M5.525 7.646a2.5 2.5 0 002.829 2.829l-2.83-2.829zm4.95.708l-2.829-2.83a2.5 2.5 0 012.829 2.829z"/><path fill-rule="evenodd" d="M13.646 14.354l-12-12 .708-.708 12 12-.708.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-eyeglasses" fill="currentColor" id="eyeglasses" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 6a2 2 0 100 4 2 2 0 000-4zm2.625.547a3 3 0 00-5.584.953H.5a.5.5 0 000 1h.541A3 3 0 007 8a1 1 0 012 0 3 3 0 005.959.5h.541a.5.5 0 000-1h-.541a3 3 0 00-5.584-.953A1.993 1.993 0 008 6c-.532 0-1.016.208-1.375.547zM14 8a2 2 0 10-4 0 2 2 0 004 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file" fill="currentColor" id="file" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-arrow-down" fill="currentColor" id="file-arrow-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M8 5a.5.5 0 01.5.5v3.793l1.146-1.147a.5.5 0 01.708.708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 11.708-.708L7.5 9.293V5.5A.5.5 0 018 5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-arrow-down-fill" fill="currentColor" id="file-arrow-down-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM8 5a.5.5 0 01.5.5v3.793l1.146-1.147a.5.5 0 01.708.708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 11.708-.708L7.5 9.293V5.5A.5.5 0 018 5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-arrow-up" fill="currentColor" id="file-arrow-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M8 11a.5.5 0 00.5-.5V6.707l1.146 1.147a.5.5 0 00.708-.708l-2-2a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L7.5 6.707V10.5a.5.5 0 00.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-arrow-up-fill" fill="currentColor" id="file-arrow-up-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM7.5 6.707V10.5a.5.5 0 001 0V6.707l1.146 1.147a.5.5 0 00.708-.708l-2-2a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L7.5 6.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-binary" fill="currentColor" id="file-binary" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path d="M5.526 13.09c.976 0 1.524-.79 1.524-2.205 0-1.412-.548-2.203-1.524-2.203-.978 0-1.526.79-1.526 2.203 0 1.415.548 2.206 1.526 2.206zm-.832-2.205c0-1.05.29-1.612.832-1.612.358 0 .607.247.733.721L4.7 11.137a6.749 6.749 0 01-.006-.252zm.832 1.614c-.36 0-.606-.246-.732-.718l1.556-1.145c.003.079.005.164.005.249 0 1.052-.29 1.614-.829 1.614zm5.329.501v-.595H9.73V8.772h-.69l-1.19.786v.688L8.986 9.5h.05v2.906h-1.18V13h3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-binary-fill" fill="currentColor" id="file-binary-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM7.05 10.885c0 1.415-.548 2.206-1.524 2.206C4.548 13.09 4 12.3 4 10.885c0-1.412.548-2.203 1.526-2.203.976 0 1.524.79 1.524 2.203zM5.526 9.273c-.542 0-.832.563-.832 1.612 0 .088.003.173.006.252l1.56-1.143c-.126-.474-.375-.72-.733-.72zm-.732 2.508c.126.472.372.718.732.718.54 0 .83-.563.83-1.614 0-.085-.003-.17-.006-.25l-1.556 1.146zm6.061.624V13h-3v-.595h1.181V9.5h-.05l-1.136.747v-.688l1.19-.786h.69v3.633h1.125z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-break" fill="currentColor" id="file-break" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 10.5a.5.5 0 01.5-.5h15a.5.5 0 010 1H.5a.5.5 0 01-.5-.5z"/><path d="M12 0H4a2 2 0 00-2 2v7h1V2a1 1 0 011-1h8a1 1 0 011 1v7h1V2a2 2 0 00-2-2zm2 12h-1v2a1 1 0 01-1 1H4a1 1 0 01-1-1v-2H2v2a2 2 0 002 2h8a2 2 0 002-2v-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-break-fill" fill="currentColor" id="file-break-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v7h12V2a2 2 0 00-2-2zm2 12H2v2a2 2 0 002 2h8a2 2 0 002-2v-2zM0 10.5a.5.5 0 01.5-.5h15a.5.5 0 010 1H.5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-check" fill="currentColor" id="file-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M10.854 6.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 11.708-.708L7.5 8.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-check-fill" fill="currentColor" id="file-check-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zm-1.146 6.854a.5.5 0 00-.708-.708L7.5 8.793 6.354 7.646a.5.5 0 10-.708.708l1.5 1.5a.5.5 0 00.708 0l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-code" fill="currentColor" id="file-code" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M8.646 5.646a.5.5 0 01.708 0l2 2a.5.5 0 010 .708l-2 2a.5.5 0 01-.708-.708L10.293 8 8.646 6.354a.5.5 0 010-.708zm-1.292 0a.5.5 0 00-.708 0l-2 2a.5.5 0 000 .708l2 2a.5.5 0 00.708-.708L5.707 8l1.647-1.646a.5.5 0 000-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-code-fill" fill="currentColor" id="file-code-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM6.646 5.646a.5.5 0 11.708.708L5.707 8l1.647 1.646a.5.5 0 01-.708.708l-2-2a.5.5 0 010-.708l2-2zm2.708 0a.5.5 0 10-.708.708L10.293 8 8.646 9.646a.5.5 0 00.708.708l2-2a.5.5 0 000-.708l-2-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-diff" fill="currentColor" id="file-diff" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M5.5 10.5A.5.5 0 016 10h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5zM8 4a.5.5 0 01.5.5V6H10a.5.5 0 010 1H8.5v1.5a.5.5 0 01-1 0V7H6a.5.5 0 010-1h1.5V4.5A.5.5 0 018 4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-diff-fill" fill="currentColor" id="file-diff-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM8.5 4.5a.5.5 0 00-1 0V6H6a.5.5 0 000 1h1.5v1.5a.5.5 0 001 0V7H10a.5.5 0 000-1H8.5V4.5zM6 10a.5.5 0 000 1h4a.5.5 0 000-1H6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark" fill="currentColor" id="file-earmark" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-arrow-down" fill="currentColor" id="file-earmark-arrow-down" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M8 6a.5.5 0 01.5.5v3.793l1.146-1.147a.5.5 0 01.708.708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 11.708-.708L7.5 10.293V6.5A.5.5 0 018 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-arrow-down-fill" fill="currentColor" id="file-earmark-arrow-down-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zm-.5 3.5a.5.5 0 00-1 0v3.793l-1.146-1.147a.5.5 0 00-.708.708l2 2a.5.5 0 00.708 0l2-2a.5.5 0 00-.708-.708L8.5 11.293V7.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-arrow-up" fill="currentColor" id="file-earmark-arrow-up" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M8 12a.5.5 0 00.5-.5V7.707l1.146 1.147a.5.5 0 00.708-.708l-2-2a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L7.5 7.707V11.5a.5.5 0 00.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-arrow-up-fill" fill="currentColor" id="file-earmark-arrow-up-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zM6.354 9.854a.5.5 0 01-.708-.708l2-2a.5.5 0 01.708 0l2 2a.5.5 0 01-.708.708L8.5 8.707V12.5a.5.5 0 01-1 0V8.707L6.354 9.854z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-binary" fill="currentColor" id="file-earmark-binary" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3zM5.526 14.09c.976 0 1.524-.79 1.524-2.205 0-1.412-.548-2.203-1.524-2.203-.978 0-1.526.79-1.526 2.203 0 1.415.548 2.206 1.526 2.206zm-.832-2.205c0-1.05.29-1.612.832-1.612.358 0 .607.247.733.721L4.7 12.137a6.749 6.749 0 01-.006-.252zm.832 1.614c-.36 0-.606-.246-.732-.718l1.556-1.145c.003.079.005.164.005.249 0 1.052-.29 1.614-.829 1.614zm5.329.501v-.595H9.73V9.772h-.69l-1.19.786v.688l1.136-.747h.05v2.906h-1.18V14h3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-binary-fill" fill="currentColor" id="file-earmark-binary-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zm-1.95 7.885c0 1.415-.548 2.206-1.524 2.206C4.548 14.09 4 13.3 4 11.885c0-1.412.548-2.203 1.526-2.203.976 0 1.524.79 1.524 2.203zm-1.524-1.612c-.542 0-.832.563-.832 1.612 0 .088.003.173.006.252l1.559-1.143c-.126-.474-.375-.72-.733-.72zm-.732 2.508c.126.472.372.718.732.718.54 0 .83-.563.83-1.614 0-.085-.003-.17-.006-.25l-1.556 1.146zm6.061.624V14h-3v-.595h1.181V10.5h-.05l-1.136.747v-.688l1.19-.786h.69v3.633h1.125z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-break" fill="currentColor" id="file-earmark-break" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9 0H4a2 2 0 00-2 2v7h1V2a1 1 0 011-1h5v2.5A1.5 1.5 0 0010.5 5H13v4h1V5L9 0zm5 12h-1v2a1 1 0 01-1 1H4a1 1 0 01-1-1v-2H2v2a2 2 0 002 2h8a2 2 0 002-2v-2zM0 10.5a.5.5 0 01.5-.5h15a.5.5 0 010 1H.5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-break-fill" fill="currentColor" id="file-earmark-break-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V9H2V2zm0 10v2a2 2 0 002 2h8a2 2 0 002-2v-2H2zm7-8l.5-2.5 3 3L10 5a1 1 0 01-1-1zm-9 6.5a.5.5 0 01.5-.5h15a.5.5 0 010 1H.5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-check" fill="currentColor" id="file-earmark-check" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M10.854 7.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 11.708-.708L7.5 9.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-check-fill" fill="currentColor" id="file-earmark-check-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zm1.354 4.354a.5.5 0 00-.708-.708L7.5 9.793 6.354 8.646a.5.5 0 10-.708.708l1.5 1.5a.5.5 0 00.708 0l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-code" fill="currentColor" id="file-earmark-code" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M8.646 6.646a.5.5 0 01.708 0l2 2a.5.5 0 010 .708l-2 2a.5.5 0 01-.708-.708L10.293 9 8.646 7.354a.5.5 0 010-.708zm-1.292 0a.5.5 0 00-.708 0l-2 2a.5.5 0 000 .708l2 2a.5.5 0 00.708-.708L5.707 9l1.647-1.646a.5.5 0 000-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-code-fill" fill="currentColor" id="file-earmark-code-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zM6.646 7.646a.5.5 0 11.708.708L5.707 10l1.647 1.646a.5.5 0 01-.708.708l-2-2a.5.5 0 010-.708l2-2zm4.708 2l-2-2a.5.5 0 10-.708.708L10.293 10l-1.647 1.646a.5.5 0 00.708.708l2-2a.5.5 0 000-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-diff" fill="currentColor" id="file-earmark-diff" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M5.5 11.5A.5.5 0 016 11h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5zM8 5a.5.5 0 01.5.5v4a.5.5 0 01-1 0v-4A.5.5 0 018 5z"/><path fill-rule="evenodd" d="M5.5 7.5A.5.5 0 016 7h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-diff-fill" fill="currentColor" id="file-earmark-diff-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zM8 6a.5.5 0 01.5.5V8H10a.5.5 0 010 1H8.5v1.5a.5.5 0 01-1 0V9H6a.5.5 0 010-1h1.5V6.5A.5.5 0 018 6zm-2.5 6.5A.5.5 0 016 12h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-easel" fill="currentColor" id="file-earmark-easel" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3zm-1 3a.5.5 0 10-1 0h1zm1.527 5H8.973l.553 1.658a.5.5 0 10.948-.316L10.027 11zM8.5 11h-1v1a.5.5 0 001 0v-1zm-1.473 0H5.973l-.447 1.342a.5.5 0 10.948.316L7.027 11z"/><path fill-rule="evenodd" d="M4 7.5A1.5 1.5 0 015.5 6h5A1.5 1.5 0 0112 7.5v2a1.5 1.5 0 01-1.5 1.5h-5A1.5 1.5 0 014 9.5v-2zM5.5 7a.5.5 0 00-.5.5v2a.5.5 0 00.5.5h5a.5.5 0 00.5-.5v-2a.5.5 0 00-.5-.5h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-easel-fill" fill="currentColor" id="file-earmark-easel-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zM8.5 6a.5.5 0 10-1 0h-2A1.5 1.5 0 004 7.5v2A1.5 1.5 0 005.5 11h.473l-.447 1.342a.5.5 0 10.948.316L7.027 11H7.5v1a.5.5 0 001 0v-1h.473l.553 1.658a.5.5 0 10.948-.316L10.027 11h.473A1.5 1.5 0 0012 9.5v-2A1.5 1.5 0 0010.5 6h-2zM5 7.5a.5.5 0 01.5-.5h5a.5.5 0 01.5.5v2a.5.5 0 01-.5.5h-5a.5.5 0 01-.5-.5v-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-fill" fill="currentColor" id="file-earmark-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V4.707A1 1 0 0013.707 4L10 .293A1 1 0 009.293 0H4zm5.5 1.5v2a1 1 0 001 1h2l-3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-font" fill="currentColor" id="file-earmark-font" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3zm1.443 3H5.057L5 8h.5c.18-1.096.356-1.192 1.694-1.235l.293-.01v5.09c0 .47-.1.582-.898.655v.5H9.41v-.5c-.803-.073-.903-.184-.903-.654V6.755l.298.01c1.338.043 1.514.14 1.694 1.235h.5l-.057-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-font-fill" fill="currentColor" id="file-earmark-font-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zM5.057 6h5.886L11 8h-.5c-.18-1.096-.356-1.192-1.694-1.235l-.298-.01v5.09c0 .47.1.582.903.655v.5H6.59v-.5c.799-.073.898-.184.898-.654V6.755l-.293.01C5.856 6.808 5.68 6.905 5.5 8H5l.057-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-image" fill="currentColor" id="file-earmark-image" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 16a2 2 0 002-2V4.5L9.5 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8zM3 2a1 1 0 011-1h5.5v2A1.5 1.5 0 0011 4.5h2V10l-2.083-2.083a.5.5 0 00-.76.063L8 11 5.835 9.7a.5.5 0 00-.611.076L3 12V2z"/><path fill-rule="evenodd" d="M6.502 7a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-image-fill" fill="currentColor" id="file-earmark-image-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0a2 2 0 00-2 2v10.293l2.87-2.87a1 1 0 011.222-.15l1.77 1.06L9.75 7.69a1 1 0 011.52-.126L14 10.293V4.707A1 1 0 0013.707 4L10 .293A1 1 0 009.293 0H4zM2 14v-.293l3.578-3.577 2.165 1.299.396.237.268-.375 2.157-3.02L14 11.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2zM9.5 1.5v2a1 1 0 001 1h2l-3-3zm-1.498 4a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-lock" fill="currentColor" id="file-earmark-lock" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M8 6a1 1 0 00-1 1v1h2V7a1 1 0 00-1-1zm2 2.076V7a2 2 0 10-4 0v1.076c-.54.166-1 .597-1 1.224v2.4c0 .816.781 1.3 1.5 1.3h3c.719 0 1.5-.484 1.5-1.3V9.3c0-.627-.46-1.058-1-1.224zM6.105 9.125C6.02 9.193 6 9.258 6 9.3v2.4c0 .042.02.107.105.175A.637.637 0 006.5 12h3a.64.64 0 00.395-.125c.085-.068.105-.133.105-.175V9.3c0-.042-.02-.107-.105-.175A.637.637 0 009.5 9h-3a.637.637 0 00-.395.125z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-lock-fill" fill="currentColor" id="file-earmark-lock-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zM7 7a1 1 0 012 0v1H7V7zm3 0v1.076c.54.166 1 .597 1 1.224v2.4c0 .816-.781 1.3-1.5 1.3h-3c-.719 0-1.5-.484-1.5-1.3V9.3c0-.627.46-1.058 1-1.224V7a2 2 0 114 0zM6 9.3c0-.042.02-.107.105-.175A.637.637 0 016.5 9h3a.64.64 0 01.395.125c.085.068.105.133.105.175v2.4c0 .042-.02.107-.105.175A.637.637 0 019.5 12h-3a.637.637 0 01-.395-.125C6.02 11.807 6 11.742 6 11.7V9.3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-lock2" fill="currentColor" id="file-earmark-lock2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 6a1 1 0 00-1 1v1h2V7a1 1 0 00-1-1zm2 2.076V7a2 2 0 10-4 0v1.076c-.54.166-1 .597-1 1.224v2.4c0 .816.781 1.3 1.5 1.3h3c.719 0 1.5-.484 1.5-1.3V9.3c0-.627-.46-1.058-1-1.224z"/><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-lock2-fill" fill="currentColor" id="file-earmark-lock2-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zM7 7a1 1 0 012 0v1H7V7zm3 0v1.076c.54.166 1 .597 1 1.224v2.4c0 .816-.781 1.3-1.5 1.3h-3c-.719 0-1.5-.484-1.5-1.3V9.3c0-.627.46-1.058 1-1.224V7a2 2 0 114 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-medical" fill="currentColor" id="file-earmark-medical" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M7 5a.5.5 0 01.5.5v.634l.549-.317a.5.5 0 11.5.866L8 7l.549.317a.5.5 0 11-.5.866L7.5 7.866V8.5a.5.5 0 01-1 0v-.634l-.549.317a.5.5 0 11-.5-.866L6 7l-.549-.317a.5.5 0 01.5-.866l.549.317V5.5A.5.5 0 017 5zm-2 5.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-medical-fill" fill="currentColor" id="file-earmark-medical-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zM6.5 5.5a.5.5 0 00-1 0v.634l-.549-.317a.5.5 0 10-.5.866L5 7l-.549.317a.5.5 0 10.5.866l.549-.317V8.5a.5.5 0 101 0v-.634l.549.317a.5.5 0 10.5-.866L7 7l.549-.317a.5.5 0 10-.5-.866l-.549.317V5.5zm-2 4.5a.5.5 0 000 1h5a.5.5 0 000-1h-5zm0 2a.5.5 0 000 1h5a.5.5 0 000-1h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-minus" fill="currentColor" id="file-earmark-minus" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M5.5 9a.5.5 0 01.5-.5h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-minus-fill" fill="currentColor" id="file-earmark-minus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zM6 8.5a.5.5 0 000 1h4a.5.5 0 000-1H6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-music" fill="currentColor" id="file-earmark-music" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M9.757 5.67A1 1 0 0111 6.64v1.75l-2 .5v3.61c0 .495-.301.883-.662 1.123C7.974 13.866 7.499 14 7 14c-.5 0-.974-.134-1.338-.377-.36-.24-.662-.628-.662-1.123s.301-.883.662-1.123C6.026 11.134 6.501 11 7 11c.356 0 .7.068 1 .196V6.89a1 1 0 01.757-.97l1-.25z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-music-fill" fill="currentColor" id="file-earmark-music-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zM11 6.64a1 1 0 00-1.243-.97l-1 .25A1 1 0 008 6.89v4.306A2.572 2.572 0 007 11c-.5 0-.974.134-1.338.377-.36.24-.662.628-.662 1.123s.301.883.662 1.123c.364.243.839.377 1.338.377.5 0 .974-.134 1.338-.377.36-.24.662-.628.662-1.123V8.89l2-.5V6.64z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-person" fill="currentColor" id="file-earmark-person" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M8 11a3 3 0 100-6 3 3 0 000 6z"/><path d="M8 12c4 0 5 1.755 5 1.755V14a1 1 0 01-1 1H4a1 1 0 01-1-1v-.245S4 12 8 12z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-person-fill" fill="currentColor" id="file-earmark-person-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zM11 8a3 3 0 11-6 0 3 3 0 016 0zm2 5.755S12 12 8 12s-5 1.755-5 1.755V14a1 1 0 001 1h8a1 1 0 001-1v-.245z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-play" fill="currentColor" id="file-earmark-play" xmlns="http://www.w3.org/2000/svg"><path d="M6 11.117V6.883a.5.5 0 01.757-.429l3.528 2.117a.5.5 0 010 .858l-3.528 2.117a.5.5 0 01-.757-.43z"/><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-play-fill" fill="currentColor" id="file-earmark-play-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zM6 6.883v4.234a.5.5 0 00.757.429l3.528-2.117a.5.5 0 000-.858L6.757 6.454a.5.5 0 00-.757.43z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-plus" fill="currentColor" id="file-earmark-plus" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M8 6.5a.5.5 0 01.5.5v1.5H10a.5.5 0 010 1H8.5V11a.5.5 0 01-1 0V9.5H6a.5.5 0 010-1h1.5V7a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-plus-fill" fill="currentColor" id="file-earmark-plus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zM8.5 7a.5.5 0 00-1 0v1.5H6a.5.5 0 000 1h1.5V11a.5.5 0 001 0V9.5H10a.5.5 0 000-1H8.5V7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-post" fill="currentColor" id="file-earmark-post" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3zM4 6.5a.5.5 0 01.5-.5h7a.5.5 0 01.5.5v7a.5.5 0 01-.5.5h-7a.5.5 0 01-.5-.5v-7z"/><path fill-rule="evenodd" d="M4 3.5a.5.5 0 01.5-.5H7a.5.5 0 010 1H4.5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-post-fill" fill="currentColor" id="file-earmark-post-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zM4.5 3a.5.5 0 000 1H7a.5.5 0 000-1H4.5zm0 3a.5.5 0 00-.5.5v7a.5.5 0 00.5.5h7a.5.5 0 00.5-.5v-7a.5.5 0 00-.5-.5h-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-richtext" fill="currentColor" id="file-earmark-richtext" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M4.5 12.5A.5.5 0 015 12h3a.5.5 0 010 1H5a.5.5 0 01-.5-.5zm0-2A.5.5 0 015 10h6a.5.5 0 010 1H5a.5.5 0 01-.5-.5zm1.639-3.708l1.33.886 1.854-1.855a.25.25 0 01.289-.047l1.888.974V8.5a.5.5 0 01-.5.5H5a.5.5 0 01-.5-.5V8s1.54-1.274 1.639-1.208zM6.25 6a.75.75 0 100-1.5.75.75 0 000 1.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-richtext-fill" fill="currentColor" id="file-earmark-richtext-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zM7 6.25a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm-.861 1.542l1.33.886 1.854-1.855a.25.25 0 01.289-.047l1.888.974V9.5a.5.5 0 01-.5.5H5a.5.5 0 01-.5-.5V9s1.54-1.274 1.639-1.208zM5 11a.5.5 0 000 1h6a.5.5 0 000-1H5zm0 2a.5.5 0 000 1h3a.5.5 0 000-1H5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-ruled" fill="currentColor" id="file-earmark-ruled" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 10H3V9h10v1H6v2h7v1H6v2H5v-2H3v-1h2v-2z"/><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-ruled-fill" fill="currentColor" id="file-earmark-ruled-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zM3 9v1h2v2H3v1h2v2h1v-2h7v-1H6v-2h7V9H3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-slides" fill="currentColor" id="file-earmark-slides" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3zm.5 10.5c0 .276-.895.5-2 .5s-2-.224-2-.5.895-.5 2-.5 2 .224 2 .5z"/><path fill-rule="evenodd" d="M4.504 6.438A.5.5 0 015 6h6a.5.5 0 01.496.438l.5 4A.5.5 0 0111.5 11h-3v2.016a7.795 7.795 0 00-1 0V11h-3a.5.5 0 01-.496-.562l.5-4zM7 7.221v2.558c0 .097.106.157.19.107l2.13-1.279a.125.125 0 000-.214l-2.13-1.28a.125.125 0 00-.19.109z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-slides-fill" fill="currentColor" id="file-earmark-slides-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zM5 6a.5.5 0 00-.496.438l-.5 4A.5.5 0 004.5 11h3v2.016c-.863.055-1.5.251-1.5.484 0 .276.895.5 2 .5s2-.224 2-.5c0-.233-.637-.429-1.5-.484V11h3a.5.5 0 00.496-.562l-.5-4A.5.5 0 0011 6H5zm2 3.78V7.22c0-.096.106-.156.19-.106l2.13 1.279a.125.125 0 010 .214l-2.13 1.28A.125.125 0 017 9.778z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-spreadsheet" fill="currentColor" id="file-earmark-spreadsheet" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 10H3V9h10v1h-3v2h3v1h-3v2H9v-2H6v2H5v-2H3v-1h2v-2zm1 0v2h3v-2H6z"/><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-spreadsheet-fill" fill="currentColor" id="file-earmark-spreadsheet-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zM3 9v1h2v2H3v1h2v2h1v-2h3v2h1v-2h3v-1h-3v-2h3V9H3zm3 3v-2h3v2H6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-text" fill="currentColor" id="file-earmark-text" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M5 11.5a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5zm0-2a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0-2a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-text-fill" fill="currentColor" id="file-earmark-text-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zM4.5 8a.5.5 0 000 1h7a.5.5 0 000-1h-7zM4 10.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h4a.5.5 0 010 1h-4a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-x" fill="currentColor" id="file-earmark-x" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M6.146 7.146a.5.5 0 01.708 0L8 8.293l1.146-1.147a.5.5 0 11.708.708L8.707 9l1.147 1.146a.5.5 0 01-.708.708L8 9.707l-1.146 1.147a.5.5 0 01-.708-.708L7.293 9 6.146 7.854a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-x-fill" fill="currentColor" id="file-earmark-x-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7.5 1.5v-2l3 3h-2a1 1 0 01-1-1zM6.854 7.146a.5.5 0 10-.708.708L7.293 9l-1.147 1.146a.5.5 0 00.708.708L8 9.707l1.146 1.147a.5.5 0 00.708-.708L8.707 9l1.147-1.146a.5.5 0 00-.708-.708L8 8.293 6.854 7.146z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-zip" fill="currentColor" id="file-earmark-zip" xmlns="http://www.w3.org/2000/svg"><path d="M4 0h5.5v1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V4.5h1V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/><path d="M9.5 3V0L14 4.5h-3A1.5 1.5 0 019.5 3z"/><path fill-rule="evenodd" d="M5 7.5a1 1 0 011-1h1a1 1 0 011 1v.938l.4 1.599a1 1 0 01-.416 1.074l-.93.62a1 1 0 01-1.11 0l-.929-.62a1 1 0 01-.415-1.074L5 8.438V7.5zm2 0H6v.938a1 1 0 01-.03.243l-.4 1.598.93.62.929-.62-.4-1.598A1 1 0 017 8.438V7.5z"/><path d="M6 1h1.5v1H6zM5 2h1.5v1H5zm1 1h1.5v1H6zM5 4h1.5v1H5zm1 1h1.5v1H6V5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-earmark-zip-fill" fill="currentColor" id="file-earmark-zip-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h5.293A1 1 0 0110 .293L13.707 4a1 1 0 01.293.707V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 2l.5-2.5 3 3L10 5a1 1 0 01-1-1zM5.5 3V2h-1V1H6v1h1v1H6v1h1v1H6v1h1v1H5.5V6h-1V5h1V4h-1V3h1zm0 4.5a1 1 0 00-1 1v.938l-.4 1.599a1 1 0 00.416 1.074l.93.62a1 1 0 001.109 0l.93-.62a1 1 0 00.415-1.074l-.4-1.599V8.5a1 1 0 00-1-1h-1zm0 1.938V8.5h1v.938a1 1 0 00.03.243l.4 1.598-.93.62-.93-.62.4-1.598a1 1 0 00.03-.243z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-easel" fill="currentColor" id="file-easel" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path d="M8.5 5a.5.5 0 10-1 0h1zm1.527 5H8.973l.553 1.658a.5.5 0 10.948-.316L10.027 10zM8.5 10h-1v1a.5.5 0 001 0v-1zm-1.473 0H5.973l-.447 1.342a.5.5 0 10.948.316L7.027 10z"/><path fill-rule="evenodd" d="M4 6.5A1.5 1.5 0 015.5 5h5A1.5 1.5 0 0112 6.5v2a1.5 1.5 0 01-1.5 1.5h-5A1.5 1.5 0 014 8.5v-2zM5.5 6a.5.5 0 00-.5.5v2a.5.5 0 00.5.5h5a.5.5 0 00.5-.5v-2a.5.5 0 00-.5-.5h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-easel-fill" fill="currentColor" id="file-easel-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM8.5 5a.5.5 0 10-1 0h-2A1.5 1.5 0 004 6.5v2A1.5 1.5 0 005.5 10h.473l-.447 1.342a.5.5 0 10.948.316L7.027 10H7.5v1a.5.5 0 001 0v-1h.473l.553 1.658a.5.5 0 10.948-.316L10.027 10h.473A1.5 1.5 0 0012 8.5v-2A1.5 1.5 0 0010.5 5h-2zM5 6.5a.5.5 0 01.5-.5h5a.5.5 0 01.5.5v2a.5.5 0 01-.5.5h-5a.5.5 0 01-.5-.5v-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-fill" fill="currentColor" id="file-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-font" fill="currentColor" id="file-font" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path d="M10.943 4H5.057L5 6h.5c.18-1.096.356-1.192 1.694-1.235l.293-.01v6.09c0 .47-.1.582-.898.655v.5H9.41v-.5c-.803-.073-.903-.184-.903-.654V4.755l.298.01c1.338.043 1.514.14 1.694 1.235h.5l-.057-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-font-fill" fill="currentColor" id="file-font-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM5.057 4h5.886L11 6h-.5c-.18-1.096-.356-1.192-1.694-1.235l-.298-.01v6.09c0 .47.1.582.903.655v.5H6.59v-.5c.799-.073.898-.184.898-.654V4.755l-.293.01C5.856 4.808 5.68 4.905 5.5 6H5l.057-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-image" fill="currentColor" id="file-image" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v10l2.224-2.224a.5.5 0 01.61-.075L8 11l2.157-3.02a.5.5 0 01.76-.063L13 10V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M6.502 7a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-image-fill" fill="currentColor" id="file-image-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v8.293l-2.73-2.73a1 1 0 00-1.52.127l-1.889 2.644-1.769-1.062a1 1 0 00-1.222.15L2 12.292V2a2 2 0 012-2zm6.564 8.27L14 11.708V14a2 2 0 01-2 2H4a2 2 0 01-2-2v-.293l3.578-3.577 2.165 1.299.396.237.268-.375 2.157-3.02zM8.002 5.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-lock" fill="currentColor" id="file-lock" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M8 5a1 1 0 00-1 1v1h2V6a1 1 0 00-1-1zm2 2.076V6a2 2 0 10-4 0v1.076c-.54.166-1 .597-1 1.224v2.4c0 .816.781 1.3 1.5 1.3h3c.719 0 1.5-.484 1.5-1.3V8.3c0-.627-.46-1.058-1-1.224zM6.105 8.125C6.02 8.193 6 8.258 6 8.3v2.4c0 .042.02.107.105.175A.637.637 0 006.5 11h3a.64.64 0 00.395-.125c.085-.068.105-.133.105-.175V8.3c0-.042-.02-.107-.105-.175A.637.637 0 009.5 8h-3a.637.637 0 00-.395.125z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-lock-fill" fill="currentColor" id="file-lock-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM7 6a1 1 0 012 0v1H7V6zm3 0v1.076c.54.166 1 .597 1 1.224v2.4c0 .816-.781 1.3-1.5 1.3h-3c-.719 0-1.5-.484-1.5-1.3V8.3c0-.627.46-1.058 1-1.224V6a2 2 0 114 0zM6 8.3c0-.042.02-.107.105-.175A.637.637 0 016.5 8h3a.64.64 0 01.395.125c.085.068.105.133.105.175v2.4c0 .042-.02.107-.105.175A.637.637 0 019.5 11h-3a.637.637 0 01-.395-.125C6.02 10.807 6 10.742 6 10.7V8.3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-lock2" fill="currentColor" id="file-lock2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M8 5a1 1 0 00-1 1v1h2V6a1 1 0 00-1-1zm2 2.076V6a2 2 0 10-4 0v1.076c-.54.166-1 .597-1 1.224v2.4c0 .816.781 1.3 1.5 1.3h3c.719 0 1.5-.484 1.5-1.3V8.3c0-.627-.46-1.058-1-1.224z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-lock2-fill" fill="currentColor" id="file-lock2-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM7 6a1 1 0 012 0v1H7V6zm3 0v1.076c.54.166 1 .597 1 1.224v2.4c0 .816-.781 1.3-1.5 1.3h-3c-.719 0-1.5-.484-1.5-1.3V8.3c0-.627.46-1.058 1-1.224V6a2 2 0 114 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-medical" fill="currentColor" id="file-medical" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M8 4a.5.5 0 01.5.5v.634l.549-.317a.5.5 0 11.5.866L9 6l.549.317a.5.5 0 11-.5.866L8.5 6.866V7.5a.5.5 0 01-1 0v-.634l-.549.317a.5.5 0 11-.5-.866L7 6l-.549-.317a.5.5 0 01.5-.866l.549.317V4.5A.5.5 0 018 4zM5 9.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-medical-fill" fill="currentColor" id="file-medical-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM8.5 4.5a.5.5 0 00-1 0v.634l-.549-.317a.5.5 0 10-.5.866L7 6l-.549.317a.5.5 0 10.5.866l.549-.317V7.5a.5.5 0 101 0v-.634l.549.317a.5.5 0 10.5-.866L9 6l.549-.317a.5.5 0 10-.5-.866l-.549.317V4.5zM5.5 9a.5.5 0 000 1h5a.5.5 0 000-1h-5zm0 2a.5.5 0 000 1h5a.5.5 0 000-1h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-minus" fill="currentColor" id="file-minus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M5.5 8a.5.5 0 01.5-.5h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-minus-fill" fill="currentColor" id="file-minus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM6 7.5a.5.5 0 000 1h4a.5.5 0 000-1H6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-music" fill="currentColor" id="file-music" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M10.304 3.13a1 1 0 011.196.98v1.8l-2.5.5v5.09c0 .495-.301.883-.662 1.123C7.974 12.866 7.499 13 7 13c-.5 0-.974-.134-1.338-.377-.36-.24-.662-.628-.662-1.123s.301-.883.662-1.123C6.026 10.134 6.501 10 7 10c.356 0 .7.068 1 .196V4.41a1 1 0 01.804-.98l1.5-.3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-music-fill" fill="currentColor" id="file-music-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zm-.5 4.11a1 1 0 00-1.196-.98l-1.5.3A1 1 0 008 4.41v5.786A2.572 2.572 0 007 10c-.5 0-.974.134-1.338.377-.36.24-.662.628-.662 1.123s.301.883.662 1.123c.364.243.839.377 1.338.377.5 0 .974-.134 1.338-.377.36-.24.662-.628.662-1.123V6.41l2.5-.5v-1.8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-person" fill="currentColor" id="file-person" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 1H4a1 1 0 00-1 1v10.755S4 11 8 11s5 1.755 5 1.755V2a1 1 0 00-1-1zM4 0a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2H4z"/><path fill-rule="evenodd" d="M8 10a3 3 0 100-6 3 3 0 000 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-person-fill" fill="currentColor" id="file-person-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zm-1 7a3 3 0 11-6 0 3 3 0 016 0zm-3 4c2.623 0 4.146.826 5 1.755V14a1 1 0 01-1 1H4a1 1 0 01-1-1v-1.245C3.854 11.825 5.377 11 8 11z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-play" fill="currentColor" id="file-play" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path d="M6 10.117V5.883a.5.5 0 01.757-.429l3.528 2.117a.5.5 0 010 .858l-3.528 2.117a.5.5 0 01-.757-.43z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-play-fill" fill="currentColor" id="file-play-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM6 5.883v4.234a.5.5 0 00.757.429l3.528-2.117a.5.5 0 000-.858L6.757 5.454a.5.5 0 00-.757.43z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-plus" fill="currentColor" id="file-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M8 5.5a.5.5 0 01.5.5v1.5H10a.5.5 0 010 1H8.5V10a.5.5 0 01-1 0V8.5H6a.5.5 0 010-1h1.5V6a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-plus-fill" fill="currentColor" id="file-plus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM8.5 6a.5.5 0 00-1 0v1.5H6a.5.5 0 000 1h1.5V10a.5.5 0 001 0V8.5H10a.5.5 0 000-1H8.5V6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-post" fill="currentColor" id="file-post" xmlns="http://www.w3.org/2000/svg"><path d="M4 5.5a.5.5 0 01.5-.5h7a.5.5 0 01.5.5v8a.5.5 0 01-.5.5h-7a.5.5 0 01-.5-.5v-8z"/><path fill-rule="evenodd" d="M4 3.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-post-fill" fill="currentColor" id="file-post-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM4.5 3a.5.5 0 000 1h5a.5.5 0 000-1h-5zm0 2a.5.5 0 00-.5.5v8a.5.5 0 00.5.5h7a.5.5 0 00.5-.5v-8a.5.5 0 00-.5-.5h-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-richtext" fill="currentColor" id="file-richtext" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M4.5 11.5A.5.5 0 015 11h3a.5.5 0 010 1H5a.5.5 0 01-.5-.5zm0-2A.5.5 0 015 9h6a.5.5 0 010 1H5a.5.5 0 01-.5-.5zm1.639-3.708l1.33.886 1.854-1.855a.25.25 0 01.289-.047l1.888.974V7.5a.5.5 0 01-.5.5H5a.5.5 0 01-.5-.5V7s1.54-1.274 1.639-1.208zM6.25 5a.75.75 0 100-1.5.75.75 0 000 1.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-richtext-fill" fill="currentColor" id="file-richtext-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM7 4.25a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm-.861 1.542l1.33.886 1.854-1.855a.25.25 0 01.289-.047l1.888.974V7.5a.5.5 0 01-.5.5H5a.5.5 0 01-.5-.5V7s1.54-1.274 1.639-1.208zM5 9a.5.5 0 000 1h6a.5.5 0 000-1H5zm0 2a.5.5 0 000 1h3a.5.5 0 000-1H5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-ruled" fill="currentColor" id="file-ruled" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm2-1a1 1 0 00-1 1v4h10V2a1 1 0 00-1-1H4zm9 6H6v2h7V7zm0 3H6v2h7v-2zm0 3H6v2h6a1 1 0 001-1v-1zm-8 2v-2H3v1a1 1 0 001 1h1zm-2-3h2v-2H3v2zm0-3h2V7H3v2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-ruled-fill" fill="currentColor" id="file-ruled-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v4h12V2a2 2 0 00-2-2zm2 7H6v2h8V7zm0 3H6v2h8v-2zm0 3H6v3h6a2 2 0 002-2v-1zm-9 3v-3H2v1a2 2 0 002 2h1zm-3-4h3v-2H2v2zm0-3h3V7H2v2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-slides" fill="currentColor" id="file-slides" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path d="M10 11.5c0 .276-.895.5-2 .5s-2-.224-2-.5.895-.5 2-.5 2 .224 2 .5z"/><path fill-rule="evenodd" d="M4.504 4.438A.5.5 0 015 4h6a.5.5 0 01.496.438l.5 4A.5.5 0 0111.5 9h-3v2.016a7.795 7.795 0 00-1 0V9h-3a.5.5 0 01-.496-.562l.5-4zM7 5.221v2.558c0 .097.106.157.19.107l2.13-1.279a.125.125 0 000-.214l-2.13-1.28a.125.125 0 00-.19.109z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-slides-fill" fill="currentColor" id="file-slides-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM5 4a.5.5 0 00-.496.438l-.5 4A.5.5 0 004.5 9h3v2.016c-.863.055-1.5.251-1.5.484 0 .276.895.5 2 .5s2-.224 2-.5c0-.233-.637-.429-1.5-.484V9h3a.5.5 0 00.496-.562l-.5-4A.5.5 0 0011 4H5zm2 3.78V5.22c0-.096.106-.156.19-.106l2.13 1.279a.125.125 0 010 .214l-2.13 1.28A.125.125 0 017 7.778z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-spreadsheet" fill="currentColor" id="file-spreadsheet" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm2-1a1 1 0 00-1 1v4h10V2a1 1 0 00-1-1H4zm9 6h-3v2h3V7zm0 3h-3v2h3v-2zm0 3h-3v2h2a1 1 0 001-1v-1zm-4 2v-2H6v2h3zm-4 0v-2H3v1a1 1 0 001 1h1zm-2-3h2v-2H3v2zm0-3h2V7H3v2zm3-2v2h3V7H6zm3 3H6v2h3v-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-spreadsheet-fill" fill="currentColor" id="file-spreadsheet-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v4h12V2a2 2 0 00-2-2zm2 7h-4v2h4V7zm0 3h-4v2h4v-2zm0 3h-4v3h2a2 2 0 002-2v-1zm-5 3v-3H6v3h3zm-4 0v-3H2v1a2 2 0 002 2h1zm-3-4h3v-2H2v2zm0-3h3V7H2v2zm4 0V7h3v2H6zm0 1h3v2H6v-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-text" fill="currentColor" id="file-text" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M4.5 10.5A.5.5 0 015 10h3a.5.5 0 010 1H5a.5.5 0 01-.5-.5zm0-2A.5.5 0 015 8h6a.5.5 0 010 1H5a.5.5 0 01-.5-.5zm0-2A.5.5 0 015 6h6a.5.5 0 010 1H5a.5.5 0 01-.5-.5zm0-2A.5.5 0 015 4h6a.5.5 0 010 1H5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-text-fill" fill="currentColor" id="file-text-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM5 4a.5.5 0 000 1h6a.5.5 0 000-1H5zm-.5 2.5A.5.5 0 015 6h6a.5.5 0 010 1H5a.5.5 0 01-.5-.5zM5 8a.5.5 0 000 1h6a.5.5 0 000-1H5zm0 2a.5.5 0 000 1h3a.5.5 0 000-1H5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-x" fill="currentColor" id="file-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M6.146 6.146a.5.5 0 01.708 0L8 7.293l1.146-1.147a.5.5 0 11.708.708L8.707 8l1.147 1.146a.5.5 0 01-.708.708L8 8.707 6.854 9.854a.5.5 0 01-.708-.708L7.293 8 6.146 6.854a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-x-fill" fill="currentColor" id="file-x-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 0H4a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2zM6.854 6.146a.5.5 0 10-.708.708L7.293 8 6.146 9.146a.5.5 0 10.708.708L8 8.707l1.146 1.147a.5.5 0 00.708-.708L8.707 8l1.147-1.146a.5.5 0 00-.708-.708L8 7.293 6.854 6.146z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-zip" fill="currentColor" id="file-zip" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H4z"/><path fill-rule="evenodd" d="M6.5 7.5a1 1 0 011-1h1a1 1 0 011 1v.938l.4 1.599a1 1 0 01-.416 1.074l-.93.62a1 1 0 01-1.109 0l-.93-.62a1 1 0 01-.415-1.074l.4-1.599V7.5zm2 0h-1v.938a1 1 0 01-.03.243l-.4 1.598.93.62.93-.62-.4-1.598a1 1 0 01-.03-.243V7.5z"/><path d="M7.5 1H9v1H7.5zm-1 1H8v1H6.5zm1 1H9v1H7.5zm-1 1H8v1H6.5zm1 1H9v1H7.5V5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-file-zip-fill" fill="currentColor" id="file-zip-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 0h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2a2 2 0 012-2zm2.5 8.5a1 1 0 011-1h1a1 1 0 011 1v.938l.4 1.599a1 1 0 01-.416 1.074l-.93.62a1 1 0 01-1.109 0l-.93-.62a1 1 0 01-.415-1.074l.4-1.599V8.5zm2 .938V8.5h-1v.938a1 1 0 01-.03.243l-.4 1.598.93.62.93-.62-.4-1.598a1 1 0 01-.03-.243zM7.5 3V2h-1V1H8v1h1v1H8v1h1v1H8v1h1v1H7.5V6h-1V5h1V4h-1V3h1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-files" fill="currentColor" id="files" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 2h7a2 2 0 012 2v10a2 2 0 01-2 2H4a2 2 0 01-2-2V4a2 2 0 012-2zm0 1a1 1 0 00-1 1v10a1 1 0 001 1h7a1 1 0 001-1V4a1 1 0 00-1-1H4z"/><path d="M6 0h7a2 2 0 012 2v10a2 2 0 01-2 2v-1a1 1 0 001-1V2a1 1 0 00-1-1H6a1 1 0 00-1 1H4a2 2 0 012-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-files-alt" fill="currentColor" id="files-alt" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 0h8a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H3z"/><path d="M13 3V2a2 2 0 012 2v8a2 2 0 01-2 2v-1a1 1 0 001-1V4a1 1 0 00-1-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-film" fill="currentColor" id="film" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1a1 1 0 011-1h14a1 1 0 011 1v14a1 1 0 01-1 1H1a1 1 0 01-1-1V1zm4 0h8v6H4V1zm8 8H4v6h8V9zM1 1h2v2H1V1zm2 3H1v2h2V4zM1 7h2v2H1V7zm2 3H1v2h2v-2zm-2 3h2v2H1v-2zM15 1h-2v2h2V1zm-2 3h2v2h-2V4zm2 3h-2v2h2V7zm-2 3h2v2h-2v-2zm2 3h-2v2h2v-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-filter" fill="currentColor" id="filter" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 10.5a.5.5 0 01.5-.5h3a.5.5 0 010 1h-3a.5.5 0 01-.5-.5zm-2-3a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm-2-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-filter-circle" fill="currentColor" id="filter-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M7 11.5a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5zm-2-3a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm-2-3a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-filter-circle-fill" fill="currentColor" id="filter-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 16A8 8 0 108 0a8 8 0 000 16zM3.5 5a.5.5 0 000 1h9a.5.5 0 000-1h-9zM5 8.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm2 3a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-filter-left" fill="currentColor" id="filter-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 10.5a.5.5 0 01.5-.5h3a.5.5 0 010 1h-3a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-filter-right" fill="currentColor" id="filter-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 10.5a.5.5 0 00-.5-.5h-3a.5.5 0 000 1h3a.5.5 0 00.5-.5zm0-3a.5.5 0 00-.5-.5h-7a.5.5 0 000 1h7a.5.5 0 00.5-.5zm0-3a.5.5 0 00-.5-.5h-11a.5.5 0 000 1h11a.5.5 0 00.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-filter-square" fill="currentColor" id="filter-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M6 11.5a.5.5 0 01.5-.5h3a.5.5 0 010 1h-3a.5.5 0 01-.5-.5zm-2-3a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm-2-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-filter-square-fill" fill="currentColor" id="filter-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm.5 5a.5.5 0 000 1h11a.5.5 0 000-1h-11zM4 8.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm2 3a.5.5 0 01.5-.5h3a.5.5 0 010 1h-3a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-flag" fill="currentColor" id="flag" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.778.085A.5.5 0 0115 .5V8a.5.5 0 01-.314.464L14.5 8l.186.464-.003.001-.006.003-.023.009a12.435 12.435 0 01-.397.15c-.264.095-.631.223-1.047.35-.816.252-1.879.523-2.71.523-.847 0-1.548-.28-2.158-.525l-.028-.01C7.68 8.71 7.14 8.5 6.5 8.5c-.7 0-1.638.23-2.437.477A19.626 19.626 0 003 9.342V15.5a.5.5 0 01-1 0V.5a.5.5 0 011 0v.282c.226-.079.496-.17.79-.26C4.606.272 5.67 0 6.5 0c.84 0 1.524.277 2.121.519l.043.018C9.286.788 9.828 1 10.5 1c.7 0 1.638-.23 2.437-.477a19.587 19.587 0 001.349-.476l.019-.007.004-.002h.001M14 1.221c-.22.078-.48.167-.766.255-.81.252-1.872.523-2.734.523-.886 0-1.592-.286-2.203-.534l-.008-.003C7.662 1.21 7.139 1 6.5 1c-.669 0-1.606.229-2.415.478A21.294 21.294 0 003 1.845v6.433c.22-.078.48-.167.766-.255C4.576 7.77 5.638 7.5 6.5 7.5c.847 0 1.548.28 2.158.525l.028.01C9.32 8.29 9.86 8.5 10.5 8.5c.668 0 1.606-.229 2.415-.478A21.317 21.317 0 0014 7.655V1.222z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-flag-fill" fill="currentColor" id="flag-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.778.085A.5.5 0 0115 .5V8a.5.5 0 01-.314.464L14.5 8l.186.464-.003.001-.006.003-.023.009a12.435 12.435 0 01-.397.15c-.264.095-.631.223-1.047.35-.816.252-1.879.523-2.71.523-.847 0-1.548-.28-2.158-.525l-.028-.01C7.68 8.71 7.14 8.5 6.5 8.5c-.7 0-1.638.23-2.437.477A19.626 19.626 0 003 9.342V15.5a.5.5 0 01-1 0V.5a.5.5 0 011 0v.282c.226-.079.496-.17.79-.26C4.606.272 5.67 0 6.5 0c.84 0 1.524.277 2.121.519l.043.018C9.286.788 9.828 1 10.5 1c.7 0 1.638-.23 2.437-.477a19.587 19.587 0 001.349-.476l.019-.007.004-.002h.001"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-flower1" fill="currentColor" id="flower1" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.174 1.184a2 2 0 013.652 0A2 2 0 0112.99 3.01a2 2 0 011.826 3.164 2 2 0 010 3.652 2 2 0 01-1.826 3.164 2 2 0 01-3.164 1.826 2 2 0 01-3.652 0A2 2 0 013.01 12.99a2 2 0 01-1.826-3.164 2 2 0 010-3.652A2 2 0 013.01 3.01a2 2 0 013.164-1.826zM8 1a1 1 0 011 1l-.002.03a4.997 4.997 0 01-.064.387c-.049.241-.122.542-.213.887a60.59 60.59 0 01-.676 2.314L8 5.762l-.045-.144a60.59 60.59 0 01-.676-2.314 16.705 16.705 0 01-.213-.887 4.99 4.99 0 01-.064-.386A1 1 0 018 1zM2 9a1 1 0 11.03-1.998l.091.01c.077.012.176.029.296.054.241.049.542.122.887.213a60.59 60.59 0 012.314.676L5.762 8l-.144.045c-.8.248-1.626.494-2.314.676-.345.091-.646.164-.887.213a4.99 4.99 0 01-.386.064L2 9zm7 5a1 1 0 01-2 0l.002-.03a4.996 4.996 0 01.064-.386c.049-.242.122-.543.213-.888.182-.688.428-1.513.676-2.314L8 10.238l.045.144c.248.8.494 1.626.676 2.314.091.345.164.646.213.887a5.005 5.005 0 01.064.386L9 14zm-5.696-2.134a1 1 0 01-1-1.732l.027-.014c.02-.01.048-.021.084-.036a5.09 5.09 0 01.283-.102c.233-.078.53-.165.874-.258a60.598 60.598 0 012.343-.572l.147-.033-.103.11a58.239 58.239 0 01-1.666 1.743c-.253.252-.477.465-.66.629a5.001 5.001 0 01-.304.248l-.025.017zM4.5 14.062a1 1 0 001.366-.366l.014-.027c.01-.02.021-.048.036-.084a5.09 5.09 0 00.102-.283c.078-.233.165-.53.258-.874a60.6 60.6 0 00.572-2.343l.033-.147-.11.102a60.848 60.848 0 00-1.743 1.667 17.07 17.07 0 00-.629.66 5.06 5.06 0 00-.248.304l-.017.025a1 1 0 00.366 1.366zm9.196-8.196a1 1 0 00-1-1.732l-.025.017a4.951 4.951 0 00-.303.248 16.69 16.69 0 00-.661.629A60.72 60.72 0 0010.04 6.77l-.102.111.147-.033a60.6 60.6 0 002.342-.572c.345-.093.642-.18.875-.258a4.993 4.993 0 00.367-.138.53.53 0 00.027-.014zM11.5 1.938a1 1 0 01.366 1.366l-.017.025a5.001 5.001 0 01-.248.303 17.01 17.01 0 01-.629.661A60.614 60.614 0 019.23 5.96l-.111.102.033-.147a60.62 60.62 0 01.572-2.342c.093-.345.18-.642.258-.875a5.066 5.066 0 01.138-.367l.014-.027a1 1 0 011.366-.366zM14 9a1 1 0 000-2l-.03.002a4.996 4.996 0 00-.386.064c-.242.049-.543.122-.888.213-.688.182-1.513.428-2.314.676L10.238 8l.144.045c.8.248 1.626.494 2.314.676.345.091.646.164.887.213a4.996 4.996 0 00.386.064L14 9zM1.938 4.5a1 1 0 00.393 1.38l.084.035c.072.03.166.064.283.103.233.078.53.165.874.258a60.88 60.88 0 002.343.572l.147.033-.103-.111a60.584 60.584 0 00-1.666-1.742 16.705 16.705 0 00-.66-.629 4.996 4.996 0 00-.304-.248l-.025-.017a1 1 0 00-1.366.366zm2.196-1.196A1 1 0 115.88 2.33c.01.02.021.048.036.084.029.072.063.166.102.283.078.233.165.53.258.875.186.687.387 1.524.572 2.342l.033.147-.11-.102a60.597 60.597 0 01-1.743-1.667 16.713 16.713 0 01-.629-.66 4.996 4.996 0 01-.248-.304l-.017-.025zm9.928 8.196a1 1 0 01-1.366.366l-.025-.017a4.946 4.946 0 01-.303-.248 16.71 16.71 0 01-.661-.629A60.73 60.73 0 0110.04 9.23l-.102-.111.147.033c.818.185 1.655.386 2.342.572.345.093.642.18.875.258a5 5 0 01.367.138 1 1 0 01.394 1.38zm-3.928 2.196a1 1 0 001.732-1l-.017-.025a5.065 5.065 0 00-.248-.303 16.705 16.705 0 00-.629-.661A60.462 60.462 0 009.23 10.04l-.111-.102.033.147a60.6 60.6 0 00.572 2.342c.093.345.18.642.258.875a4.985 4.985 0 00.138.367.575.575 0 00.014.027zM8 9.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-flower2" fill="currentColor" id="flower2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 16a4 4 0 004-4 4 4 0 000-8 4 4 0 00-8 0 4 4 0 100 8 4 4 0 004 4zm3-12a3 3 0 00-6 0c0 .073.01.155.03.247.544.241 1.091.638 1.598 1.084A2.987 2.987 0 018 5c.494 0 .96.12 1.372.331.507-.446 1.054-.843 1.598-1.084.02-.092.03-.174.03-.247zm-.812 6.052A2.99 2.99 0 0011 8a2.99 2.99 0 00-.812-2.052c.215-.18.432-.346.647-.487C11.34 5.131 11.732 5 12 5a3 3 0 110 6c-.268 0-.66-.13-1.165-.461a6.833 6.833 0 01-.647-.487zm-3.56.617a3.001 3.001 0 002.744 0c.507.446 1.054.842 1.598 1.084.02.091.03.174.03.247a3 3 0 11-6 0c0-.073.01-.155.03-.247.544-.242 1.091-.638 1.598-1.084zm-.816-4.721A2.99 2.99 0 005 8c0 .794.308 1.516.812 2.052a6.83 6.83 0 01-.647.487C4.66 10.869 4.268 11 4 11a3 3 0 010-6c.268 0 .66.13 1.165.461.215.141.432.306.647.487zM8 9a1 1 0 110-2 1 1 0 010 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-flower3" fill="currentColor" id="flower3" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.424 8c.437-.052.811-.136 1.04-.268a2 2 0 00-2-3.464c-.229.132-.489.414-.752.767C9.886 4.63 10 4.264 10 4a2 2 0 10-4 0c0 .264.114.63.288 1.035-.263-.353-.523-.635-.752-.767a2 2 0 00-2 3.464c.229.132.603.216 1.04.268-.437.052-.811.136-1.04.268a2 2 0 102 3.464c.229-.132.489-.414.752-.767C6.114 11.37 6 11.736 6 12a2 2 0 104 0c0-.264-.114-.63-.288-1.035.263.353.523.635.752.767a2 2 0 102-3.464c-.229-.132-.603-.216-1.04-.268zM9 4a1 1 0 00-2 0 1.473 1.473 0 00.045.206c.039.131.1.294.183.483.166.378.396.808.637 1.223l.135.23.135-.23c.241-.415.47-.845.637-1.223.083-.19.144-.352.183-.484.02-.065.031-.116.038-.154C9 4.018 9 4.002 9 4zM3.67 5.5a1 1 0 00.366 1.366 1.47 1.47 0 00.2.064c.134.032.305.06.51.083.411.045.898.061 1.379.06.09 0 .178 0 .266-.002a21.82 21.82 0 00-.131-.232 12.88 12.88 0 00-.742-1.163 4.215 4.215 0 00-.327-.4 1.472 1.472 0 00-.115-.11c-.025-.022-.038-.03-.04-.032A1 1 0 003.67 5.5zm1.366 5.366a1 1 0 01-1-1.732c.001 0 .016-.008.047-.02.037-.013.087-.028.153-.044.134-.032.305-.06.51-.083a12.88 12.88 0 011.379-.06c.09 0 .178 0 .266.002a21.82 21.82 0 01-.131.232c-.24.416-.497.83-.742 1.163a4.1 4.1 0 01-.327.4 1.483 1.483 0 01-.155.142zM9 12a1 1 0 01-2 0 1.476 1.476 0 01.045-.206c.039-.131.1-.294.183-.483.166-.378.396-.808.637-1.223L8 9.858l.135.23c.241.415.47.845.637 1.223.083.19.144.352.183.484A1.338 1.338 0 019 12zm3.33-6.5a1 1 0 01-.366 1.366 1.478 1.478 0 01-.2.064c-.134.032-.305.06-.51.083-.412.045-.898.061-1.379.06-.09 0-.178 0-.266-.002l.131-.232c.24-.416.497-.83.742-1.163a4.1 4.1 0 01.327-.4c.046-.05.085-.086.114-.11.026-.022.04-.03.041-.032a1 1 0 011.366.366zm-1.366 5.366a1 1 0 001-1.732c-.002 0-.016-.008-.047-.02a1.478 1.478 0 00-.153-.044 4.217 4.217 0 00-.51-.083 12.881 12.881 0 00-1.379-.06c-.09 0-.178 0-.266.002a22 22 0 00.131.232c.24.416.497.83.742 1.163.122.167.232.3.327.4a1.494 1.494 0 00.155.142zM8 9a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-folder" fill="currentColor" id="folder" xmlns="http://www.w3.org/2000/svg"><path d="M9.828 4a3 3 0 01-2.12-.879l-.83-.828A1 1 0 006.173 2H2.5a1 1 0 00-1 .981L1.546 4h-1L.5 3a2 2 0 012-2h3.672a2 2 0 011.414.586l.828.828A2 2 0 009.828 3v1z"/><path fill-rule="evenodd" d="M13.81 4H2.19a1 1 0 00-.996 1.09l.637 7a1 1 0 00.995.91h10.348a1 1 0 00.995-.91l.637-7A1 1 0 0013.81 4zM2.19 3A2 2 0 00.198 5.181l.637 7A2 2 0 002.826 14h10.348a2 2 0 001.991-1.819l.637-7A2 2 0 0013.81 3H2.19z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-folder-check" fill="currentColor" id="folder-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.828 4H2.19a1 1 0 00-.996 1.09l.637 7a1 1 0 00.995.91H9v1H2.826a2 2 0 01-1.991-1.819l-.637-7a1.99 1.99 0 01.342-1.31L.5 3a2 2 0 012-2h3.672a2 2 0 011.414.586l.828.828A2 2 0 009.828 3h3.982a2 2 0 011.992 2.181L15.546 8H14.54l.265-2.91A1 1 0 0013.81 4H9.828zm-2.95-1.707L7.587 3H2.19c-.24 0-.47.042-.684.12L1.5 2.98a1 1 0 011-.98h3.672a1 1 0 01.707.293z"/><path fill-rule="evenodd" d="M15.854 10.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 01.708-.708l1.146 1.147 2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-folder-fill" fill="currentColor" id="folder-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.828 3h3.982a2 2 0 011.992 2.181l-.637 7A2 2 0 0113.174 14H2.826a2 2 0 01-1.991-1.819l-.637-7a1.99 1.99 0 01.342-1.31L.5 3a2 2 0 012-2h3.672a2 2 0 011.414.586l.828.828A2 2 0 009.828 3zm-8.322.12C1.72 3.042 1.95 3 2.19 3h5.396l-.707-.707A1 1 0 006.172 2H2.5a1 1 0 00-1 .981l.006.139z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-folder-minus" fill="currentColor" id="folder-minus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.828 4H2.19a1 1 0 00-.996 1.09l.637 7a1 1 0 00.995.91H9v1H2.826a2 2 0 01-1.991-1.819l-.637-7a1.99 1.99 0 01.342-1.31L.5 3a2 2 0 012-2h3.672a2 2 0 011.414.586l.828.828A2 2 0 009.828 3h3.982a2 2 0 011.992 2.181L15.546 8H14.54l.265-2.91A1 1 0 0013.81 4H9.828zm-2.95-1.707L7.587 3H2.19c-.24 0-.47.042-.684.12L1.5 2.98a1 1 0 011-.98h3.672a1 1 0 01.707.293z"/><path fill-rule="evenodd" d="M11 11.5a.5.5 0 01.5-.5h4a.5.5 0 010 1h-4a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-folder-plus" fill="currentColor" id="folder-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.828 4H2.19a1 1 0 00-.996 1.09l.637 7a1 1 0 00.995.91H9v1H2.826a2 2 0 01-1.991-1.819l-.637-7a1.99 1.99 0 01.342-1.31L.5 3a2 2 0 012-2h3.672a2 2 0 011.414.586l.828.828A2 2 0 009.828 3h3.982a2 2 0 011.992 2.181L15.546 8H14.54l.265-2.91A1 1 0 0013.81 4H9.828zm-2.95-1.707L7.587 3H2.19c-.24 0-.47.042-.684.12L1.5 2.98a1 1 0 011-.98h3.672a1 1 0 01.707.293z"/><path fill-rule="evenodd" d="M13.5 10a.5.5 0 01.5.5V12h1.5a.5.5 0 010 1H14v1.5a.5.5 0 01-1 0V13h-1.5a.5.5 0 010-1H13v-1.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-folder-symlink" fill="currentColor" id="folder-symlink" xmlns="http://www.w3.org/2000/svg"><path d="M9.828 4a3 3 0 01-2.12-.879l-.83-.828A1 1 0 006.173 2H2.5a1 1 0 00-1 .981L1.546 4h-1L.5 3a2 2 0 012-2h3.672a2 2 0 011.414.586l.828.828A2 2 0 009.828 3v1z"/><path fill-rule="evenodd" d="M13.81 4H2.19a1 1 0 00-.996 1.09l.637 7a1 1 0 00.995.91h10.348a1 1 0 00.995-.91l.637-7A1 1 0 0013.81 4zM2.19 3A2 2 0 00.198 5.181l.637 7A2 2 0 002.826 14h10.348a2 2 0 001.991-1.819l.637-7A2 2 0 0013.81 3H2.19z"/><path d="M8.616 10.24l3.182-1.969a.443.443 0 000-.742l-3.182-1.97c-.27-.166-.616.036-.616.372V6.7c-.857 0-3.429 0-4 4.8 1.429-2.7 4-2.4 4-2.4v.769c0 .336.346.538.616.371z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-folder-symlink-fill" fill="currentColor" id="folder-symlink-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13.81 3H9.828a2 2 0 01-1.414-.586l-.828-.828A2 2 0 006.172 1H2.5a2 2 0 00-2 2l.04.87a1.99 1.99 0 00-.342 1.311l.637 7A2 2 0 002.826 14h10.348a2 2 0 001.991-1.819l.637-7A2 2 0 0013.81 3zM2.19 3c-.24 0-.47.042-.684.12L1.5 2.98a1 1 0 011-.98h3.672a1 1 0 01.707.293L7.586 3H2.19zm9.608 5.271l-3.182 1.97c-.27.166-.616-.036-.616-.372V9.1s-2.571-.3-4 2.4c.571-4.8 3.143-4.8 4-4.8v-.769c0-.336.346-.538.616-.371l3.182 1.969c.27.166.27.576 0 .742z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-folder-x" fill="currentColor" id="folder-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.828 4H2.19a1 1 0 00-.996 1.09l.637 7a1 1 0 00.995.91H9v1H2.826a2 2 0 01-1.991-1.819l-.637-7a1.99 1.99 0 01.342-1.31L.5 3a2 2 0 012-2h3.672a2 2 0 011.414.586l.828.828A2 2 0 009.828 3h3.982a2 2 0 011.992 2.181L15.546 8H14.54l.265-2.91A1 1 0 0013.81 4H9.828zm-2.95-1.707L7.587 3H2.19c-.24 0-.47.042-.684.12L1.5 2.98a1 1 0 011-.98h3.672a1 1 0 01.707.293z"/><path fill-rule="evenodd" d="M11.146 10.146a.5.5 0 01.708 0L13 11.293l1.146-1.147a.5.5 0 01.708.708L13.707 12l1.147 1.146a.5.5 0 01-.708.708L13 12.707l-1.146 1.147a.5.5 0 01-.708-.708L12.293 12l-1.147-1.146a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-folder2" fill="currentColor" id="folder2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 3.5A1.5 1.5 0 012.5 2h2.764c.958 0 1.76.56 2.311 1.184C7.985 3.648 8.48 4 9 4h4.5A1.5 1.5 0 0115 5.5v7a1.5 1.5 0 01-1.5 1.5h-11A1.5 1.5 0 011 12.5v-9zM2.5 3a.5.5 0 00-.5.5V6h12v-.5a.5.5 0 00-.5-.5H9c-.964 0-1.71-.629-2.174-1.154C6.374 3.334 5.82 3 5.264 3H2.5zM14 7H2v5.5a.5.5 0 00.5.5h11a.5.5 0 00.5-.5V7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-folder2-open" fill="currentColor" id="folder2-open" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 3.5A1.5 1.5 0 012.5 2h2.764c.958 0 1.76.56 2.311 1.184C7.985 3.648 8.48 4 9 4h4.5A1.5 1.5 0 0115 5.5v.64c.57.265.94.876.856 1.546l-.64 5.124A2.5 2.5 0 0112.733 15H3.266a2.5 2.5 0 01-2.481-2.19l-.64-5.124A1.5 1.5 0 011 6.14V3.5zM2 6h12v-.5a.5.5 0 00-.5-.5H9c-.964 0-1.71-.629-2.174-1.154C6.374 3.334 5.82 3 5.264 3H2.5a.5.5 0 00-.5.5V6zm-.367 1a.5.5 0 00-.496.562l.64 5.124A1.5 1.5 0 003.266 14h9.468a1.5 1.5 0 001.489-1.314l.64-5.124A.5.5 0 0014.367 7H1.633z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-fonts" fill="currentColor" id="fonts" xmlns="http://www.w3.org/2000/svg"><path d="M12.258 3H3.747l-.082 2.46h.479c.26-1.544.758-1.783 2.693-1.845l.424-.013v7.827c0 .663-.144.82-1.3.923v.52h4.082v-.52c-1.162-.103-1.306-.26-1.306-.923V3.602l.43.013c1.935.062 2.434.301 2.694 1.846h.479L12.258 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-forward" fill="currentColor" id="forward" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.502 5.513a.144.144 0 00-.202.134V6.65a.5.5 0 01-.5.5H2.5v2.9h6.3a.5.5 0 01.5.5v1.003c0 .108.11.176.202.134l3.984-2.933a.51.51 0 01.042-.028.147.147 0 000-.252.51.51 0 01-.042-.028L9.502 5.513zM8.3 5.647a1.144 1.144 0 011.767-.96l3.994 2.94a1.147 1.147 0 010 1.946l-3.994 2.94a1.144 1.144 0 01-1.767-.96v-.503H2a.5.5 0 01-.5-.5v-3.9a.5.5 0 01.5-.5h6.3v-.503z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-forward-fill" fill="currentColor" id="forward-fill" xmlns="http://www.w3.org/2000/svg"><path d="M9.77 12.11l4.012-2.953a.647.647 0 000-1.114L9.771 5.09a.644.644 0 00-.971.557V6.65H2v3.9h6.8v1.003c0 .505.545.808.97.557z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-front" fill="currentColor" id="front" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h8a2 2 0 012 2v2h2a2 2 0 012 2v8a2 2 0 01-2 2H6a2 2 0 01-2-2v-2H2a2 2 0 01-2-2V2zm5 10v2a1 1 0 001 1h8a1 1 0 001-1V6a1 1 0 00-1-1h-2v5a2 2 0 01-2 2H5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-fullscreen" fill="currentColor" id="fullscreen" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 1a.5.5 0 00-.5.5v4a.5.5 0 01-1 0v-4A1.5 1.5 0 011.5 0h4a.5.5 0 010 1h-4zM10 .5a.5.5 0 01.5-.5h4A1.5 1.5 0 0116 1.5v4a.5.5 0 01-1 0v-4a.5.5 0 00-.5-.5h-4a.5.5 0 01-.5-.5zM.5 10a.5.5 0 01.5.5v4a.5.5 0 00.5.5h4a.5.5 0 010 1h-4A1.5 1.5 0 010 14.5v-4a.5.5 0 01.5-.5zm15 0a.5.5 0 01.5.5v4a1.5 1.5 0 01-1.5 1.5h-4a.5.5 0 010-1h4a.5.5 0 00.5-.5v-4a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-fullscreen-exit" fill="currentColor" id="fullscreen-exit" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.5 0a.5.5 0 01.5.5v4A1.5 1.5 0 014.5 6h-4a.5.5 0 010-1h4a.5.5 0 00.5-.5v-4a.5.5 0 01.5-.5zm5 0a.5.5 0 01.5.5v4a.5.5 0 00.5.5h4a.5.5 0 010 1h-4A1.5 1.5 0 0110 4.5v-4a.5.5 0 01.5-.5zM0 10.5a.5.5 0 01.5-.5h4A1.5 1.5 0 016 11.5v4a.5.5 0 01-1 0v-4a.5.5 0 00-.5-.5h-4a.5.5 0 01-.5-.5zm10 1a1.5 1.5 0 011.5-1.5h4a.5.5 0 010 1h-4a.5.5 0 00-.5.5v4a.5.5 0 01-1 0v-4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-funnel" fill="currentColor" id="funnel" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 012 1h12a.5.5 0 01.5.5v2a.5.5 0 01-.128.334L10 8.692V13.5a.5.5 0 01-.342.474l-3 1A.5.5 0 016 14.5V8.692L1.628 3.834A.5.5 0 011.5 3.5v-2zm1 .5v1.308l4.372 4.858A.5.5 0 017 8.5v5.306l2-.666V8.5a.5.5 0 01.128-.334L13.5 3.308V2h-11z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-funnel-fill" fill="currentColor" id="funnel-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 1.5A.5.5 0 012 1h12a.5.5 0 01.5.5v2a.5.5 0 01-.128.334L10 8.692V13.5a.5.5 0 01-.342.474l-3 1A.5.5 0 016 14.5V8.692L1.628 3.834A.5.5 0 011.5 3.5v-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-gear" fill="currentColor" id="gear" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.837 1.626c-.246-.835-1.428-.835-1.674 0l-.094.319A1.873 1.873 0 014.377 3.06l-.292-.16c-.764-.415-1.6.42-1.184 1.185l.159.292a1.873 1.873 0 01-1.115 2.692l-.319.094c-.835.246-.835 1.428 0 1.674l.319.094a1.873 1.873 0 011.115 2.693l-.16.291c-.415.764.42 1.6 1.185 1.184l.292-.159a1.873 1.873 0 012.692 1.116l.094.318c.246.835 1.428.835 1.674 0l.094-.319a1.873 1.873 0 012.693-1.115l.291.16c.764.415 1.6-.42 1.184-1.185l-.159-.291a1.873 1.873 0 011.116-2.693l.318-.094c.835-.246.835-1.428 0-1.674l-.319-.094a1.873 1.873 0 01-1.115-2.692l.16-.292c.415-.764-.42-1.6-1.185-1.184l-.291.159A1.873 1.873 0 018.93 1.945l-.094-.319zm-2.633-.283c.527-1.79 3.065-1.79 3.592 0l.094.319a.873.873 0 001.255.52l.292-.16c1.64-.892 3.434.901 2.54 2.541l-.159.292a.873.873 0 00.52 1.255l.319.094c1.79.527 1.79 3.065 0 3.592l-.319.094a.873.873 0 00-.52 1.255l.16.292c.893 1.64-.902 3.434-2.541 2.54l-.292-.159a.873.873 0 00-1.255.52l-.094.319c-.527 1.79-3.065 1.79-3.592 0l-.094-.319a.873.873 0 00-1.255-.52l-.292.16c-1.64.893-3.433-.902-2.54-2.541l.159-.292a.873.873 0 00-.52-1.255l-.319-.094c-1.79-.527-1.79-3.065 0-3.592l.319-.094a.873.873 0 00.52-1.255l-.16-.292c-.892-1.64.902-3.433 2.541-2.54l.292.159a.873.873 0 001.255-.52l.094-.319z"/><path fill-rule="evenodd" d="M8 5.754a2.246 2.246 0 100 4.492 2.246 2.246 0 000-4.492zM4.754 8a3.246 3.246 0 116.492 0 3.246 3.246 0 01-6.492 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-gear-fill" fill="currentColor" id="gear-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.405 1.05c-.413-1.4-2.397-1.4-2.81 0l-.1.34a1.464 1.464 0 01-2.105.872l-.31-.17c-1.283-.698-2.686.705-1.987 1.987l.169.311c.446.82.023 1.841-.872 2.105l-.34.1c-1.4.413-1.4 2.397 0 2.81l.34.1a1.464 1.464 0 01.872 2.105l-.17.31c-.698 1.283.705 2.686 1.987 1.987l.311-.169a1.464 1.464 0 012.105.872l.1.34c.413 1.4 2.397 1.4 2.81 0l.1-.34a1.464 1.464 0 012.105-.872l.31.17c1.283.698 2.686-.705 1.987-1.987l-.169-.311a1.464 1.464 0 01.872-2.105l.34-.1c1.4-.413 1.4-2.397 0-2.81l-.34-.1a1.464 1.464 0 01-.872-2.105l.17-.31c.698-1.283-.705-2.686-1.987-1.987l-.311.169a1.464 1.464 0 01-2.105-.872l-.1-.34zM8 10.93a2.929 2.929 0 100-5.86 2.929 2.929 0 000 5.858z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-gear-wide" fill="currentColor" id="gear-wide" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.932.727c-.243-.97-1.62-.97-1.864 0l-.071.286a.96.96 0 01-1.622.434l-.205-.211c-.695-.719-1.888-.03-1.613.931l.08.284a.96.96 0 01-1.186 1.187l-.284-.081c-.96-.275-1.65.918-.931 1.613l.211.205a.96.96 0 01-.434 1.622l-.286.071c-.97.243-.97 1.62 0 1.864l.286.071a.96.96 0 01.434 1.622l-.211.205c-.719.695-.03 1.888.931 1.613l.284-.08a.96.96 0 011.187 1.187l-.081.283c-.275.96.918 1.65 1.613.931l.205-.211a.96.96 0 011.622.434l.071.286c.243.97 1.62.97 1.864 0l.071-.286a.96.96 0 011.622-.434l.205.211c.695.719 1.888.03 1.613-.931l-.08-.284a.96.96 0 011.187-1.187l.283.081c.96.275 1.65-.918.931-1.613l-.211-.205a.96.96 0 01.434-1.622l.286-.071c.97-.243.97-1.62 0-1.864l-.286-.071a.96.96 0 01-.434-1.622l.211-.205c.719-.695.03-1.888-.931-1.613l-.284.08a.96.96 0 01-1.187-1.186l.081-.284c.275-.96-.918-1.65-1.613-.931l-.205.211a.96.96 0 01-1.622-.434L8.932.727zM8 12.997a4.998 4.998 0 100-9.995 4.998 4.998 0 000 9.996z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-gear-wide-connected" fill="currentColor" id="gear-wide-connected" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.932.727c-.243-.97-1.62-.97-1.864 0l-.071.286a.96.96 0 01-1.622.434l-.205-.211c-.695-.719-1.888-.03-1.613.931l.08.284a.96.96 0 01-1.186 1.187l-.284-.081c-.96-.275-1.65.918-.931 1.613l.211.205a.96.96 0 01-.434 1.622l-.286.071c-.97.243-.97 1.62 0 1.864l.286.071a.96.96 0 01.434 1.622l-.211.205c-.719.695-.03 1.888.931 1.613l.284-.08a.96.96 0 011.187 1.187l-.081.283c-.275.96.918 1.65 1.613.931l.205-.211a.96.96 0 011.622.434l.071.286c.243.97 1.62.97 1.864 0l.071-.286a.96.96 0 011.622-.434l.205.211c.695.719 1.888.03 1.613-.931l-.08-.284a.96.96 0 011.187-1.187l.283.081c.96.275 1.65-.918.931-1.613l-.211-.205a.96.96 0 01.434-1.622l.286-.071c.97-.243.97-1.62 0-1.864l-.286-.071a.96.96 0 01-.434-1.622l.211-.205c.719-.695.03-1.888-.931-1.613l-.284.08a.96.96 0 01-1.187-1.186l.081-.284c.275-.96-.918-1.65-1.613-.931l-.205.211a.96.96 0 01-1.622-.434L8.932.727zM8 12.997a4.998 4.998 0 100-9.995 4.998 4.998 0 000 9.996z"/><path fill-rule="evenodd" d="M7.375 8L4.602 4.302l.8-.6L8.25 7.5h4.748v1H8.25L5.4 12.298l-.8-.6L7.376 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-gem" fill="currentColor" id="gem" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.1.7a.5.5 0 01.4-.2h9a.5.5 0 01.4.2l2.976 3.974c.149.185.156.45.01.644L8.4 15.3a.5.5 0 01-.8 0L.1 5.3a.5.5 0 010-.6l3-4zm11.386 3.785l-1.806-2.41-.776 2.413 2.582-.003zm-3.633.004l.961-2.989H4.186l.963 2.995 5.704-.006zM5.47 5.495l5.062-.005L8 13.366 5.47 5.495zm-1.371-.999l-.78-2.422-1.818 2.425 2.598-.003zM1.499 5.5l2.92-.003 2.193 6.82L1.5 5.5zm7.889 6.817l2.194-6.828 2.929-.003-5.123 6.831z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-geo" fill="currentColor" id="geo" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a3 3 0 100 6 3 3 0 000-6zM4 4a4 4 0 114.5 3.969V13.5a.5.5 0 01-1 0V7.97A4 4 0 014 3.999zm2.493 8.574a.5.5 0 01-.411.575c-.712.118-1.28.295-1.655.493a1.319 1.319 0 00-.37.265.301.301 0 00-.057.09V14l.002.008a.147.147 0 00.016.033.617.617 0 00.145.15c.165.13.435.27.813.395.751.25 1.82.414 3.024.414s2.273-.163 3.024-.414c.378-.126.648-.265.813-.395a.619.619 0 00.146-.15.148.148 0 00.015-.033L12 14v-.004a.301.301 0 00-.057-.09 1.318 1.318 0 00-.37-.264c-.376-.198-.943-.375-1.655-.493a.5.5 0 11.164-.986c.77.127 1.452.328 1.957.594C12.5 13 13 13.4 13 14c0 .426-.26.752-.544.977-.29.228-.68.413-1.116.558-.878.293-2.059.465-3.34.465-1.281 0-2.462-.172-3.34-.465-.436-.145-.826-.33-1.116-.558C3.26 14.752 3 14.426 3 14c0-.599.5-1 .961-1.243.505-.266 1.187-.467 1.957-.594a.5.5 0 01.575.411z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-geo-alt" fill="currentColor" id="geo-alt" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12.166 8.94C12.696 7.867 13 6.862 13 6A5 5 0 003 6c0 .862.305 1.867.834 2.94.524 1.062 1.234 2.12 1.96 3.07A31.481 31.481 0 008 14.58l.208-.22a31.493 31.493 0 001.998-2.35c.726-.95 1.436-2.008 1.96-3.07zM8 16s6-5.686 6-10A6 6 0 002 6c0 4.314 6 10 6 10z"/><path fill-rule="evenodd" d="M8 8a2 2 0 100-4 2 2 0 000 4zm0 1a3 3 0 100-6 3 3 0 000 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-geo-alt-fill" fill="currentColor" id="geo-alt-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 16s6-5.686 6-10A6 6 0 002 6c0 4.314 6 10 6 10zm0-7a3 3 0 100-6 3 3 0 000 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-geo-fill" fill="currentColor" id="geo-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 4a4 4 0 114.5 3.969V13.5a.5.5 0 01-1 0V7.97A4 4 0 014 3.999zm2.493 8.574a.5.5 0 01-.411.575c-.712.118-1.28.295-1.655.493a1.319 1.319 0 00-.37.265.301.301 0 00-.057.09V14l.002.008a.147.147 0 00.016.033.617.617 0 00.145.15c.165.13.435.27.813.395.751.25 1.82.414 3.024.414s2.273-.163 3.024-.414c.378-.126.648-.265.813-.395a.619.619 0 00.146-.15.148.148 0 00.015-.033L12 14v-.004a.301.301 0 00-.057-.09 1.318 1.318 0 00-.37-.264c-.376-.198-.943-.375-1.655-.493a.5.5 0 11.164-.986c.77.127 1.452.328 1.957.594C12.5 13 13 13.4 13 14c0 .426-.26.752-.544.977-.29.228-.68.413-1.116.558-.878.293-2.059.465-3.34.465-1.281 0-2.462-.172-3.34-.465-.436-.145-.826-.33-1.116-.558C3.26 14.752 3 14.426 3 14c0-.599.5-1 .961-1.243.505-.266 1.187-.467 1.957-.594a.5.5 0 01.575.411z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-gift" fill="currentColor" id="gift" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 2.5a2.5 2.5 0 015 0 2.5 2.5 0 015 0v.006c0 .07 0 .27-.038.494H15a1 1 0 011 1v2a1 1 0 01-1 1v7.5a1.5 1.5 0 01-1.5 1.5h-11A1.5 1.5 0 011 14.5V7a1 1 0 01-1-1V4a1 1 0 011-1h2.038A2.968 2.968 0 013 2.506V2.5zm1.068.5H7v-.5a1.5 1.5 0 10-3 0c0 .085.002.274.045.43a.522.522 0 00.023.07zM9 3h2.932a.56.56 0 00.023-.07c.043-.156.045-.345.045-.43a1.5 1.5 0 00-3 0V3zM1 4v2h6V4H1zm8 0v2h6V4H9zm5 3H9v8h4.5a.5.5 0 00.5-.5V7zm-7 8V7H2v7.5a.5.5 0 00.5.5H7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-gift-fill" fill="currentColor" id="gift-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 2.5a2.5 2.5 0 015 0 2.5 2.5 0 015 0v.006c0 .07 0 .27-.038.494H15a1 1 0 011 1v1a1 1 0 01-1 1H1a1 1 0 01-1-1V4a1 1 0 011-1h2.038A2.968 2.968 0 013 2.506V2.5zm1.068.5H7v-.5a1.5 1.5 0 10-3 0c0 .085.002.274.045.43a.522.522 0 00.023.07zM9 3h2.932a.56.56 0 00.023-.07c.043-.156.045-.345.045-.43a1.5 1.5 0 00-3 0V3z"/><path d="M15 7v7.5a1.5 1.5 0 01-1.5 1.5H9V7h6zM2.5 16A1.5 1.5 0 011 14.5V7h6v9H2.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-globe" fill="currentColor" id="globe" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm7.5-6.923c-.67.204-1.335.82-1.887 1.855A7.97 7.97 0 005.145 4H7.5V1.077zM4.09 4H2.255a7.025 7.025 0 013.072-2.472 6.7 6.7 0 00-.597.933c-.247.464-.462.98-.64 1.539zm-.582 3.5h-2.49c.062-.89.291-1.733.656-2.5H3.82a13.652 13.652 0 00-.312 2.5zM4.847 5H7.5v2.5H4.51A12.5 12.5 0 014.846 5zM8.5 5v2.5h2.99a12.495 12.495 0 00-.337-2.5H8.5zM4.51 8.5H7.5V11H4.847a12.5 12.5 0 01-.338-2.5zm3.99 0V11h2.653c.187-.765.306-1.608.338-2.5H8.5zM5.145 12H7.5v2.923c-.67-.204-1.335-.82-1.887-1.855A7.97 7.97 0 015.145 12zm.182 2.472a6.696 6.696 0 01-.597-.933A9.268 9.268 0 014.09 12H2.255a7.024 7.024 0 003.072 2.472zM3.82 11H1.674a6.958 6.958 0 01-.656-2.5h2.49c.03.877.138 1.718.312 2.5zm6.853 3.472A7.024 7.024 0 0013.745 12H11.91a9.27 9.27 0 01-.64 1.539 6.688 6.688 0 01-.597.933zM8.5 12h2.355a7.967 7.967 0 01-.468 1.068c-.552 1.035-1.218 1.65-1.887 1.855V12zm3.68-1h2.146c.365-.767.594-1.61.656-2.5h-2.49a13.65 13.65 0 01-.312 2.5zm2.802-3.5h-2.49A13.65 13.65 0 0012.18 5h2.146c.365.767.594 1.61.656 2.5zM11.27 2.461c.247.464.462.98.64 1.539h1.835a7.024 7.024 0 00-3.072-2.472c.218.284.418.598.597.933zM10.855 4H8.5V1.077c.67.204 1.335.82 1.887 1.855.173.324.33.682.468 1.068z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-globe2" fill="currentColor" id="globe2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm7.5-6.923c-.67.204-1.335.82-1.887 1.855-.143.268-.276.56-.395.872.705.157 1.472.257 2.282.287V1.077zM4.249 3.539a8.372 8.372 0 01-1.198-.49 7.01 7.01 0 012.276-1.52 6.7 6.7 0 00-.597.932 8.854 8.854 0 00-.48 1.079zM3.509 7.5H1.017A6.964 6.964 0 012.38 3.825c.47.258.995.482 1.565.667A13.4 13.4 0 003.508 7.5zm1.4-2.741c.808.187 1.681.301 2.591.332V7.5H4.51c.035-.987.176-1.914.399-2.741zM8.5 5.09V7.5h2.99a12.342 12.342 0 00-.399-2.741c-.808.187-1.681.301-2.591.332zM4.51 8.5H7.5v2.409c-.91.03-1.783.145-2.591.332a12.343 12.343 0 01-.4-2.741zm3.99 0v2.409c.91.03 1.783.145 2.591.332.223-.827.364-1.754.4-2.741H8.5zm-3.282 3.696A12.63 12.63 0 017.5 11.91v3.014c-.67-.204-1.335-.82-1.887-1.855a7.776 7.776 0 01-.395-.872zm.11 2.276a6.696 6.696 0 01-.598-.933 8.853 8.853 0 01-.481-1.079 8.38 8.38 0 00-1.198.49 7.01 7.01 0 002.276 1.522zm-1.383-2.964a9.083 9.083 0 00-1.565.667A6.963 6.963 0 011.018 8.5h2.49a13.36 13.36 0 00.437 3.008zm6.728 2.964a7.009 7.009 0 002.275-1.521 8.376 8.376 0 00-1.197-.49 8.853 8.853 0 01-.481 1.078 6.688 6.688 0 01-.597.933zM8.5 11.909c.81.03 1.577.13 2.282.287-.12.312-.252.604-.395.872-.552 1.035-1.218 1.65-1.887 1.855V11.91zm3.555-.401c.57.185 1.095.409 1.565.667A6.963 6.963 0 0014.982 8.5h-2.49a13.36 13.36 0 01-.437 3.008zM14.982 7.5h-2.49a13.361 13.361 0 00-.437-3.008 9.123 9.123 0 001.565-.667A6.963 6.963 0 0114.982 7.5zM11.27 2.461c.177.334.339.694.482 1.078a8.368 8.368 0 001.196-.49 7.01 7.01 0 00-2.275-1.52c.218.283.418.597.597.932zm-.488 1.343c-.705.157-1.473.257-2.282.287V1.077c.67.204 1.335.82 1.887 1.855.143.268.276.56.395.872z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-graph-down" fill="currentColor" id="graph-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 0h1v15h15v1H0V0zm10 11.5a.5.5 0 00.5.5h4a.5.5 0 00.5-.5v-4a.5.5 0 00-1 0v2.6l-3.613-4.417a.5.5 0 00-.74-.037L7.06 8.233 3.404 3.206a.5.5 0 00-.808.588l4 5.5a.5.5 0 00.758.06l2.609-2.61L13.445 11H10.5a.5.5 0 00-.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-graph-up" fill="currentColor" id="graph-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 0h1v15h15v1H0V0zm10 3.5a.5.5 0 01.5-.5h4a.5.5 0 01.5.5v4a.5.5 0 01-1 0V4.9l-3.613 4.417a.5.5 0 01-.74.037L7.06 6.767l-3.656 5.027a.5.5 0 01-.808-.588l4-5.5a.5.5 0 01.758-.06l2.609 2.61L13.445 4H10.5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grid" fill="currentColor" id="grid" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 2.5A1.5 1.5 0 012.5 1h3A1.5 1.5 0 017 2.5v3A1.5 1.5 0 015.5 7h-3A1.5 1.5 0 011 5.5v-3zM2.5 2a.5.5 0 00-.5.5v3a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-3a.5.5 0 00-.5-.5h-3zm6.5.5A1.5 1.5 0 0110.5 1h3A1.5 1.5 0 0115 2.5v3A1.5 1.5 0 0113.5 7h-3A1.5 1.5 0 019 5.5v-3zm1.5-.5a.5.5 0 00-.5.5v3a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-3a.5.5 0 00-.5-.5h-3zM1 10.5A1.5 1.5 0 012.5 9h3A1.5 1.5 0 017 10.5v3A1.5 1.5 0 015.5 15h-3A1.5 1.5 0 011 13.5v-3zm1.5-.5a.5.5 0 00-.5.5v3a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-3a.5.5 0 00-.5-.5h-3zm6.5.5A1.5 1.5 0 0110.5 9h3a1.5 1.5 0 011.5 1.5v3a1.5 1.5 0 01-1.5 1.5h-3A1.5 1.5 0 019 13.5v-3zm1.5-.5a.5.5 0 00-.5.5v3a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-3a.5.5 0 00-.5-.5h-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grid-1x2" fill="currentColor" id="grid-1x2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 1H1v14h5V1zm9 0h-5v5h5V1zm0 9h-5v5h5v-5zM0 1a1 1 0 011-1h5a1 1 0 011 1v14a1 1 0 01-1 1H1a1 1 0 01-1-1V1zm9 0a1 1 0 011-1h5a1 1 0 011 1v5a1 1 0 01-1 1h-5a1 1 0 01-1-1V1zm1 8a1 1 0 00-1 1v5a1 1 0 001 1h5a1 1 0 001-1v-5a1 1 0 00-1-1h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grid-1x2-fill" fill="currentColor" id="grid-1x2-fill" xmlns="http://www.w3.org/2000/svg"><path d="M0 1a1 1 0 011-1h5a1 1 0 011 1v14a1 1 0 01-1 1H1a1 1 0 01-1-1V1zm9 0a1 1 0 011-1h5a1 1 0 011 1v5a1 1 0 01-1 1h-5a1 1 0 01-1-1V1zm0 9a1 1 0 011-1h5a1 1 0 011 1v5a1 1 0 01-1 1h-5a1 1 0 01-1-1v-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grid-3x2" fill="currentColor" id="grid-3x2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 3.5A1.5 1.5 0 011.5 2h13A1.5 1.5 0 0116 3.5v8a1.5 1.5 0 01-1.5 1.5h-13A1.5 1.5 0 010 11.5v-8zM1.5 3a.5.5 0 00-.5.5V7h4V3H1.5zM5 8H1v3.5a.5.5 0 00.5.5H5V8zm1 0h4v4H6V8zm4-1H6V3h4v4zm1 1v4h3.5a.5.5 0 00.5-.5V8h-4zm0-1V3h3.5a.5.5 0 01.5.5V7h-4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grid-3x2-gap" fill="currentColor" id="grid-3x2-gap" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 4H2v2h2V4zm1 7V9a1 1 0 00-1-1H2a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1zm0-5V4a1 1 0 00-1-1H2a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1zm5 5V9a1 1 0 00-1-1H7a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1zm0-5V4a1 1 0 00-1-1H7a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1zM9 4H7v2h2V4zm5 0h-2v2h2V4zM4 9H2v2h2V9zm5 0H7v2h2V9zm5 0h-2v2h2V9zm-3-5a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V4zm1 4a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V9a1 1 0 00-1-1h-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grid-3x2-gap-fill" fill="currentColor" id="grid-3x2-gap-fill" xmlns="http://www.w3.org/2000/svg"><path d="M1 4a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H2a1 1 0 01-1-1V4zm5 0a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H7a1 1 0 01-1-1V4zm5 0a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V4zM1 9a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H2a1 1 0 01-1-1V9zm5 0a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H7a1 1 0 01-1-1V9zm5 0a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V9z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grid-3x3" fill="currentColor" id="grid-3x3" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A1.5 1.5 0 011.5 0h13A1.5 1.5 0 0116 1.5v13a1.5 1.5 0 01-1.5 1.5h-13A1.5 1.5 0 010 14.5v-13zM1.5 1a.5.5 0 00-.5.5V5h4V1H1.5zM5 6H1v4h4V6zm1 4V6h4v4H6zm-1 1H1v3.5a.5.5 0 00.5.5H5v-4zm1 0h4v4H6v-4zm5 0v4h3.5a.5.5 0 00.5-.5V11h-4zm0-1h4V6h-4v4zm0-5h4V1.5a.5.5 0 00-.5-.5H11v4zm-1 0H6V1h4v4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grid-3x3-gap" fill="currentColor" id="grid-3x3-gap" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 2H2v2h2V2zm1 12v-2a1 1 0 00-1-1H2a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1zm0-5V7a1 1 0 00-1-1H2a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1zm0-5V2a1 1 0 00-1-1H2a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1zm5 10v-2a1 1 0 00-1-1H7a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1zm0-5V7a1 1 0 00-1-1H7a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1zm0-5V2a1 1 0 00-1-1H7a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1zM9 2H7v2h2V2zm5 0h-2v2h2V2zM4 7H2v2h2V7zm5 0H7v2h2V7zm5 0h-2v2h2V7zM4 12H2v2h2v-2zm5 0H7v2h2v-2zm5 0h-2v2h2v-2zM12 1a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1V2a1 1 0 00-1-1h-2zm-1 6a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V7zm1 4a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1h-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grid-3x3-gap-fill" fill="currentColor" id="grid-3x3-gap-fill" xmlns="http://www.w3.org/2000/svg"><path d="M1 2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H2a1 1 0 01-1-1V2zm5 0a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H7a1 1 0 01-1-1V2zm5 0a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V2zM1 7a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H2a1 1 0 01-1-1V7zm5 0a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H7a1 1 0 01-1-1V7zm5 0a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1V7zM1 12a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H2a1 1 0 01-1-1v-2zm5 0a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1H7a1 1 0 01-1-1v-2zm5 0a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 01-1 1h-2a1 1 0 01-1-1v-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grid-fill" fill="currentColor" id="grid-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 2.5A1.5 1.5 0 012.5 1h3A1.5 1.5 0 017 2.5v3A1.5 1.5 0 015.5 7h-3A1.5 1.5 0 011 5.5v-3zm8 0A1.5 1.5 0 0110.5 1h3A1.5 1.5 0 0115 2.5v3A1.5 1.5 0 0113.5 7h-3A1.5 1.5 0 019 5.5v-3zm-8 8A1.5 1.5 0 012.5 9h3A1.5 1.5 0 017 10.5v3A1.5 1.5 0 015.5 15h-3A1.5 1.5 0 011 13.5v-3zm8 0A1.5 1.5 0 0110.5 9h3a1.5 1.5 0 011.5 1.5v3a1.5 1.5 0 01-1.5 1.5h-3A1.5 1.5 0 019 13.5v-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grip-horizontal" fill="currentColor" id="grip-horizontal" xmlns="http://www.w3.org/2000/svg"><path d="M7 2a1 1 0 11-2 0 1 1 0 012 0zm3 0a1 1 0 11-2 0 1 1 0 012 0zM7 5a1 1 0 11-2 0 1 1 0 012 0zm3 0a1 1 0 11-2 0 1 1 0 012 0zM7 8a1 1 0 11-2 0 1 1 0 012 0zm3 0a1 1 0 11-2 0 1 1 0 012 0zm-3 3a1 1 0 11-2 0 1 1 0 012 0zm3 0a1 1 0 11-2 0 1 1 0 012 0zm-3 3a1 1 0 11-2 0 1 1 0 012 0zm3 0a1 1 0 11-2 0 1 1 0 012 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-grip-vertical" fill="currentColor" id="grip-vertical" xmlns="http://www.w3.org/2000/svg"><path d="M2 8a1 1 0 110 2 1 1 0 010-2zm0-3a1 1 0 110 2 1 1 0 010-2zm3 3a1 1 0 110 2 1 1 0 010-2zm0-3a1 1 0 110 2 1 1 0 010-2zm3 3a1 1 0 110 2 1 1 0 010-2zm0-3a1 1 0 110 2 1 1 0 010-2zm3 3a1 1 0 110 2 1 1 0 010-2zm0-3a1 1 0 110 2 1 1 0 010-2zm3 3a1 1 0 110 2 1 1 0 010-2zm0-3a1 1 0 110 2 1 1 0 010-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hammer" fill="currentColor" id="hammer" xmlns="http://www.w3.org/2000/svg"><path d="M9.812 1.952a.5.5 0 01-.312.89c-1.671 0-2.852.596-3.616 1.185L4.857 5.073V6.21a.5.5 0 01-.146.354L3.425 7.853a.5.5 0 01-.708 0L.146 5.274a.5.5 0 010-.706l1.286-1.29a.5.5 0 01.354-.146H2.84C4.505 1.228 6.216.862 7.557 1.04a5.009 5.009 0 012.077.782l.178.129z"/><path fill-rule="evenodd" d="M6.012 3.5a.5.5 0 01.359.165l9.146 8.646A.5.5 0 0115.5 13L14 14.5a.5.5 0 01-.756-.056L4.598 5.297a.5.5 0 01.048-.65l1-1a.5.5 0 01.366-.147z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hand-index" fill="currentColor" id="hand-index" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.75 1a.75.75 0 00-.75.75V9a.5.5 0 01-1 0v-.89l-1.003.2a.5.5 0 00-.399.546l.345 3.105a1.5 1.5 0 00.243.666l1.433 2.15a.5.5 0 00.416.223h6.385a.5.5 0 00.434-.252l1.395-2.442a2.5 2.5 0 00.317-.991l.272-2.715a1 1 0 00-.995-1.1H13.5v1a.5.5 0 01-1 0V7.154a4.208 4.208 0 00-.2-.26c-.187-.222-.368-.383-.486-.43-.124-.05-.392-.063-.708-.039a4.844 4.844 0 00-.106.01V8a.5.5 0 01-1 0V5.986c0-.167-.073-.272-.15-.314a1.657 1.657 0 00-.448-.182c-.179-.035-.5-.04-.816-.027l-.086.004V8a.5.5 0 01-1 0V1.75A.75.75 0 006.75 1zM8.5 4.466V1.75a1.75 1.75 0 00-3.5 0v5.34l-1.199.24a1.5 1.5 0 00-1.197 1.636l.345 3.106a2.5 2.5 0 00.405 1.11l1.433 2.15A1.5 1.5 0 006.035 16h6.385a1.5 1.5 0 001.302-.756l1.395-2.441a3.5 3.5 0 00.444-1.389l.272-2.715a2 2 0 00-1.99-2.199h-.582a5.184 5.184 0 00-.195-.248c-.191-.229-.51-.568-.88-.716-.364-.146-.846-.132-1.158-.108l-.132.012a1.26 1.26 0 00-.56-.642 2.634 2.634 0 00-.738-.288c-.31-.062-.739-.058-1.05-.046l-.048.002zm2.094 2.025z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hand-index-thumb" fill="currentColor" id="hand-index-thumb" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.75 1a.75.75 0 00-.75.75V9.5a.5.5 0 01-.854.354l-2.41-2.411a.517.517 0 00-.809.631l2.512 4.185 1.232 2.465a.5.5 0 00.447.276h6.302a.5.5 0 00.434-.252l1.395-2.442a2.5 2.5 0 00.317-.991l.272-2.715a1 1 0 00-.995-1.1H13.5v1a.5.5 0 11-1 0V7.154a4.208 4.208 0 00-.2-.26c-.187-.222-.368-.383-.486-.43-.124-.05-.392-.063-.708-.039a4.844 4.844 0 00-.106.01V8a.5.5 0 11-1 0V5.986c0-.167-.073-.272-.15-.314a1.657 1.657 0 00-.448-.182c-.179-.035-.5-.04-.816-.027l-.086.004V8a.5.5 0 11-1 0V1.75A.75.75 0 006.75 1zM8.5 4.466V1.75a1.75 1.75 0 10-3.5 0v6.543L3.443 6.736A1.517 1.517 0 001.07 8.588l2.491 4.153 1.215 2.43A1.5 1.5 0 006.118 16h6.302a1.5 1.5 0 001.302-.756l1.395-2.441a3.5 3.5 0 00.444-1.389l.272-2.715a2 2 0 00-1.99-2.199h-.582a5.114 5.114 0 00-.195-.248c-.191-.229-.51-.568-.88-.716-.364-.146-.846-.132-1.158-.108l-.132.012a1.26 1.26 0 00-.56-.642 2.634 2.634 0 00-.738-.288c-.31-.062-.739-.058-1.05-.046l-.048.002zm2.094 2.025z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hand-thumbs-down" fill="currentColor" id="hand-thumbs-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.956 14.534c.065.936.952 1.659 1.908 1.42l.261-.065a1.378 1.378 0 001.012-.965c.22-.816.533-2.512.062-4.51.136.02.285.037.443.051.713.065 1.669.071 2.516-.211.518-.173.994-.68 1.2-1.272a1.896 1.896 0 00-.234-1.734c.058-.118.103-.242.138-.362.077-.27.113-.568.113-.857 0-.288-.036-.585-.113-.856a2.094 2.094 0 00-.16-.403c.169-.387.107-.82-.003-1.149a3.162 3.162 0 00-.488-.9c.054-.153.076-.313.076-.465a1.86 1.86 0 00-.253-.912C13.1.757 12.437.28 11.5.28v1c.563 0 .901.272 1.066.56.086.15.121.3.121.416 0 .12-.035.165-.04.17l-.354.353.353.354c.202.202.407.512.505.805.104.312.043.44-.005.488l-.353.353.353.354c.043.043.105.141.154.315.048.167.075.37.075.581 0 .212-.027.415-.075.582-.05.174-.111.272-.154.315l-.353.353.353.354c.353.352.373.714.267 1.021-.122.35-.396.593-.571.651-.653.218-1.447.224-2.11.164a8.907 8.907 0 01-1.094-.17l-.014-.004H9.62a.5.5 0 00-.595.643 8.34 8.34 0 01.145 4.725c-.03.112-.128.215-.288.255l-.262.066c-.306.076-.642-.156-.667-.519-.075-1.081-.239-2.15-.482-2.85-.174-.502-.603-1.267-1.238-1.977C5.597 8.926 4.715 8.23 3.62 7.93 3.226 7.823 3 7.534 3 7.28V3.279c0-.26.22-.515.553-.55 1.293-.138 1.936-.53 2.491-.869l.04-.024c.27-.165.495-.296.776-.393.277-.096.63-.163 1.14-.163h3.5v-1H8c-.605 0-1.07.08-1.466.217a4.823 4.823 0 00-.97.485l-.048.029c-.504.308-.999.61-2.068.723C2.682 1.815 2 2.434 2 3.279v4c0 .851.685 1.433 1.357 1.616.849.232 1.574.787 2.132 1.41.56.626.914 1.28 1.039 1.638.199.575.356 1.54.428 2.591z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hand-thumbs-up" fill="currentColor" id="hand-thumbs-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.956 1.745C7.021.81 7.908.087 8.864.325l.261.066c.463.116.874.456 1.012.965.22.816.533 2.511.062 4.51a9.84 9.84 0 01.443-.051c.713-.065 1.669-.072 2.516.21.518.173.994.681 1.2 1.273.184.532.16 1.162-.234 1.733.058.119.103.242.138.363.077.27.113.567.113.856 0 .289-.036.586-.113.856-.039.135-.09.273-.16.404.169.387.107.819-.003 1.148a3.163 3.163 0 01-.488.901c.054.152.076.312.076.465 0 .305-.089.625-.253.912C13.1 15.522 12.437 16 11.5 16v-1c.563 0 .901-.272 1.066-.56a.865.865 0 00.121-.416c0-.12-.035-.165-.04-.17l-.354-.354.353-.354c.202-.201.407-.511.505-.804.104-.312.043-.441-.005-.488l-.353-.354.353-.354c.043-.042.105-.14.154-.315.048-.167.075-.37.075-.581 0-.211-.027-.414-.075-.581-.05-.174-.111-.273-.154-.315L12.793 9l.353-.354c.353-.352.373-.713.267-1.02-.122-.35-.396-.593-.571-.652-.653-.217-1.447-.224-2.11-.164a8.907 8.907 0 00-1.094.171l-.014.003-.003.001a.5.5 0 01-.595-.643 8.34 8.34 0 00.145-4.726c-.03-.111-.128-.215-.288-.255l-.262-.065c-.306-.077-.642.156-.667.518-.075 1.082-.239 2.15-.482 2.85-.174.502-.603 1.268-1.238 1.977-.637.712-1.519 1.41-2.614 1.708-.394.108-.62.396-.62.65v4.002c0 .26.22.515.553.55 1.293.137 1.936.53 2.491.868l.04.025c.27.164.495.296.776.393.277.095.63.163 1.14.163h3.5v1H8c-.605 0-1.07-.081-1.466-.218a4.82 4.82 0 01-.97-.484l-.048-.03c-.504-.307-.999-.609-2.068-.722C2.682 14.464 2 13.846 2 13V9c0-.85.685-1.432 1.357-1.615.849-.232 1.574-.787 2.132-1.41.56-.627.914-1.28 1.039-1.639.199-.575.356-1.539.428-2.59z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-handbag" fill="currentColor" id="handbag" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a2 2 0 00-2 2v2h4V3a2 2 0 00-2-2zm3 4V3a3 3 0 10-6 0v2H3.361a1.5 1.5 0 00-1.483 1.277L.85 13.13A2.5 2.5 0 003.322 16h9.356a2.5 2.5 0 002.472-2.87l-1.028-6.853A1.5 1.5 0 0012.64 5H11zm-1 1v1.5a.5.5 0 001 0V6h1.639a.5.5 0 01.494.426l1.028 6.851A1.5 1.5 0 0112.678 15H3.322a1.5 1.5 0 01-1.483-1.723l1.028-6.851A.5.5 0 013.36 6H5v1.5a.5.5 0 001 0V6h4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-handbag-fill" fill="currentColor" id="handbag-fill" xmlns="http://www.w3.org/2000/svg"><path d="M8 1a2 2 0 00-2 2v2H5V3a3 3 0 016 0v2h-1V3a2 2 0 00-2-2zM5 5H3.361a1.5 1.5 0 00-1.483 1.277L.85 13.13A2.5 2.5 0 003.322 16h9.356a2.5 2.5 0 002.472-2.87l-1.028-6.853A1.5 1.5 0 0012.64 5H11v1.5a.5.5 0 01-1 0V5H6v1.5a.5.5 0 01-1 0V5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hash" fill="currentColor" id="hash" xmlns="http://www.w3.org/2000/svg"><path d="M8.39 12.648a1.32 1.32 0 00-.015.18c0 .305.21.508.5.508.266 0 .492-.172.555-.477l.554-2.703h1.204c.421 0 .617-.234.617-.547 0-.312-.188-.53-.617-.53h-.985l.516-2.524h1.265c.43 0 .618-.227.618-.547 0-.313-.188-.524-.618-.524h-1.046l.476-2.304a1.06 1.06 0 00.016-.164.51.51 0 00-.516-.516.54.54 0 00-.539.43l-.523 2.554H7.617l.477-2.304c.008-.04.015-.118.015-.164a.512.512 0 00-.523-.516.539.539 0 00-.531.43L6.53 5.484H5.414c-.43 0-.617.22-.617.532 0 .312.187.539.617.539h.906l-.515 2.523H4.609c-.421 0-.609.219-.609.531 0 .313.188.547.61.547h.976l-.516 2.492c-.008.04-.015.125-.015.18 0 .305.21.508.5.508.265 0 .492-.172.554-.477l.555-2.703h2.242l-.515 2.492zm-1-6.109h2.266l-.515 2.563H6.859l.532-2.563z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hdd" fill="currentColor" id="hdd" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 9H2a1 1 0 00-1 1v1a1 1 0 001 1h12a1 1 0 001-1v-1a1 1 0 00-1-1zM2 8a2 2 0 00-2 2v1a2 2 0 002 2h12a2 2 0 002-2v-1a2 2 0 00-2-2H2z"/><path d="M5 10.5a.5.5 0 11-1 0 .5.5 0 011 0zm-2 0a.5.5 0 11-1 0 .5.5 0 011 0z"/><path fill-rule="evenodd" d="M4.094 4a.5.5 0 00-.44.26l-2.47 4.532A1.5 1.5 0 001 9.51v.99H0v-.99c0-.418.105-.83.305-1.197l2.472-4.531A1.5 1.5 0 014.094 3h7.812a1.5 1.5 0 011.317.782l2.472 4.53c.2.368.305.78.305 1.198v.99h-1v-.99a1.5 1.5 0 00-.183-.718L12.345 4.26a.5.5 0 00-.439-.26H4.094z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hdd-fill" fill="currentColor" id="hdd-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 10a2 2 0 012-2h12a2 2 0 012 2v1a2 2 0 01-2 2H2a2 2 0 01-2-2v-1zm2.5 1a.5.5 0 100-1 .5.5 0 000 1zm2 0a.5.5 0 100-1 .5.5 0 000 1z"/><path d="M.91 7.204A2.993 2.993 0 012 7h12c.384 0 .752.072 1.09.204l-1.867-3.422A1.5 1.5 0 0011.906 3H4.094a1.5 1.5 0 00-1.317.782L.91 7.204z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hdd-network" fill="currentColor" id="hdd-network" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v1a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v1a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/><path d="M5 4.5a.5.5 0 11-1 0 .5.5 0 011 0zm-2 0a.5.5 0 11-1 0 .5.5 0 011 0z"/><path fill-rule="evenodd" d="M7.5 10V7h1v3a1.5 1.5 0 011.5 1.5h5.5a.5.5 0 010 1H10A1.5 1.5 0 018.5 14h-1A1.5 1.5 0 016 12.5H.5a.5.5 0 010-1H6A1.5 1.5 0 017.5 10zm0 1a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hdd-network-fill" fill="currentColor" id="hdd-network-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 00-2 2v1a2 2 0 002 2h5.5v3A1.5 1.5 0 006 11.5H.5a.5.5 0 000 1H6A1.5 1.5 0 007.5 14h1a1.5 1.5 0 001.5-1.5h5.5a.5.5 0 000-1H10A1.5 1.5 0 008.5 10V7H14a2 2 0 002-2V4a2 2 0 00-2-2H2zm.5 3a.5.5 0 100-1 .5.5 0 000 1zm2 0a.5.5 0 100-1 .5.5 0 000 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hdd-rack" fill="currentColor" id="hdd-rack" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 10H2a1 1 0 00-1 1v1a1 1 0 001 1h12a1 1 0 001-1v-1a1 1 0 00-1-1zM2 9a2 2 0 00-2 2v1a2 2 0 002 2h12a2 2 0 002-2v-1a2 2 0 00-2-2H2z"/><path d="M5 11.5a.5.5 0 11-1 0 .5.5 0 011 0zm-2 0a.5.5 0 11-1 0 .5.5 0 011 0z"/><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v1a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v1a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/><path d="M5 4.5a.5.5 0 11-1 0 .5.5 0 011 0zm-2 0a.5.5 0 11-1 0 .5.5 0 011 0z"/><path fill-rule="evenodd" d="M3 9V7h1v2H3zm9 0V7h1v2h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hdd-rack-fill" fill="currentColor" id="hdd-rack-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 9a2 2 0 00-2 2v1a2 2 0 002 2h12a2 2 0 002-2v-1a2 2 0 00-2-2H2zm.5 3a.5.5 0 100-1 .5.5 0 000 1zm2 0a.5.5 0 100-1 .5.5 0 000 1zM2 2a2 2 0 00-2 2v1a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2zm.5 3a.5.5 0 100-1 .5.5 0 000 1zm2 0a.5.5 0 100-1 .5.5 0 000 1zM3 9V7h1v2H3zm9 0V7h1v2h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hdd-stack" fill="currentColor" id="hdd-stack" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 10H2a1 1 0 00-1 1v1a1 1 0 001 1h12a1 1 0 001-1v-1a1 1 0 00-1-1zM2 9a2 2 0 00-2 2v1a2 2 0 002 2h12a2 2 0 002-2v-1a2 2 0 00-2-2H2z"/><path d="M5 11.5a.5.5 0 11-1 0 .5.5 0 011 0zm-2 0a.5.5 0 11-1 0 .5.5 0 011 0z"/><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v1a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v1a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/><path d="M5 4.5a.5.5 0 11-1 0 .5.5 0 011 0zm-2 0a.5.5 0 11-1 0 .5.5 0 011 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hdd-stack-fill" fill="currentColor" id="hdd-stack-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 9a2 2 0 00-2 2v1a2 2 0 002 2h12a2 2 0 002-2v-1a2 2 0 00-2-2H2zm.5 3a.5.5 0 100-1 .5.5 0 000 1zm2 0a.5.5 0 100-1 .5.5 0 000 1zM2 2a2 2 0 00-2 2v1a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2zm.5 3a.5.5 0 100-1 .5.5 0 000 1zm2 0a.5.5 0 100-1 .5.5 0 000 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-headphones" fill="currentColor" id="headphones" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 3a5 5 0 00-5 5v4.5H2V8a6 6 0 1112 0v4.5h-1V8a5 5 0 00-5-5z"/><path d="M11 10a1 1 0 011-1h2v4a1 1 0 01-1 1h-1a1 1 0 01-1-1v-3zm-6 0a1 1 0 00-1-1H2v4a1 1 0 001 1h1a1 1 0 001-1v-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-headset" fill="currentColor" id="headset" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a5 5 0 00-5 5v4.5H2V6a6 6 0 1112 0v4.5h-1V6a5 5 0 00-5-5z"/><path d="M11 8a1 1 0 011-1h2v4a1 1 0 01-1 1h-1a1 1 0 01-1-1V8zM5 8a1 1 0 00-1-1H2v4a1 1 0 001 1h1a1 1 0 001-1V8z"/><path fill-rule="evenodd" d="M13.5 8.5a.5.5 0 01.5.5v3a2.5 2.5 0 01-2.5 2.5H8a.5.5 0 010-1h3.5A1.5 1.5 0 0013 12V9a.5.5 0 01.5-.5z"/><path d="M6.5 14a1 1 0 011-1h1a1 1 0 110 2h-1a1 1 0 01-1-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-heart" fill="currentColor" id="heart" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 2.748l-.717-.737C5.6.281 2.514.878 1.4 3.053c-.523 1.023-.641 2.5.314 4.385.92 1.815 2.834 3.989 6.286 6.357 3.452-2.368 5.365-4.542 6.286-6.357.955-1.886.838-3.362.314-4.385C13.486.878 10.4.28 8.717 2.01L8 2.748zM8 15C-7.333 4.868 3.279-3.04 7.824 1.143c.06.055.119.112.176.171a3.12 3.12 0 01.176-.17C12.72-3.042 23.333 4.867 8 15z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-heart-fill" fill="currentColor" id="heart-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1.314C12.438-3.248 23.534 4.735 8 15-7.534 4.736 3.562-3.248 8 1.314z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-heart-half" fill="currentColor" id="heart-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1.314C3.562-3.248-7.534 4.735 8 15V1.314z"/><path fill-rule="evenodd" d="M8 2.748l-.717-.737C5.6.281 2.514.878 1.4 3.053c-.523 1.023-.641 2.5.314 4.385.92 1.815 2.834 3.989 6.286 6.357 3.452-2.368 5.365-4.542 6.286-6.357.955-1.886.838-3.362.314-4.385C13.486.878 10.4.28 8.717 2.01L8 2.748zM8 15C-7.333 4.868 3.279-3.04 7.824 1.143c.06.055.119.112.176.171a3.12 3.12 0 01.176-.17C12.72-3.042 23.333 4.867 8 15z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-heptagon" fill="currentColor" id="heptagon" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.779.052a.5.5 0 01.442 0l6.015 2.97a.5.5 0 01.267.34l1.485 6.676a.5.5 0 01-.093.415l-4.162 5.354a.5.5 0 01-.395.193H4.662a.5.5 0 01-.395-.193L.105 10.453a.5.5 0 01-.093-.415l1.485-6.676a.5.5 0 01.267-.34L7.779.053zM2.422 3.813l-1.383 6.212L4.907 15h6.186l3.868-4.975-1.383-6.212L8 1.058 2.422 3.813z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-heptagon-fill" fill="currentColor" id="heptagon-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.779.052a.5.5 0 01.442 0l6.015 2.97a.5.5 0 01.267.34l1.485 6.676a.5.5 0 01-.093.415l-4.162 5.354a.5.5 0 01-.395.193H4.662a.5.5 0 01-.395-.193L.105 10.453a.5.5 0 01-.093-.415l1.485-6.676a.5.5 0 01.267-.34L7.779.053z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-heptagon-half" fill="currentColor" id="heptagon-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.779.052a.5.5 0 01.442 0l6.015 2.97a.5.5 0 01.267.34l1.485 6.676a.5.5 0 01-.093.415l-4.162 5.354a.5.5 0 01-.395.193H4.662a.5.5 0 01-.395-.193L.105 10.453a.5.5 0 01-.093-.415l1.485-6.676a.5.5 0 01.267-.34L7.779.053zM8 15h3.093l3.868-4.975-1.383-6.212L8 1.058V15z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hexagon" fill="currentColor" id="hexagon" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 4.577L8 1 2 4.577v6.846L8 15l6-3.577V4.577zM8.5.134a1 1 0 00-1 0l-6 3.577a1 1 0 00-.5.866v6.846a1 1 0 00.5.866l6 3.577a1 1 0 001 0l6-3.577a1 1 0 00.5-.866V4.577a1 1 0 00-.5-.866L8.5.134z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hexagon-fill" fill="currentColor" id="hexagon-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.5.134a1 1 0 00-1 0l-6 3.577a1 1 0 00-.5.866v6.846a1 1 0 00.5.866l6 3.577a1 1 0 001 0l6-3.577a1 1 0 00.5-.866V4.577a1 1 0 00-.5-.866L8.5.134z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hexagon-half" fill="currentColor" id="hexagon-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 4.577L8 1v14l6-3.577V4.577zM8.5.134a1 1 0 00-1 0l-6 3.577a1 1 0 00-.5.866v6.846a1 1 0 00.5.866l6 3.577a1 1 0 001 0l6-3.577a1 1 0 00.5-.866V4.577a1 1 0 00-.5-.866L8.5.134z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hourglass" fill="currentColor" id="hourglass" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 1.5a.5.5 0 01.5-.5h11a.5.5 0 010 1h-1v1a4.5 4.5 0 01-2.557 4.06c-.29.139-.443.377-.443.59v.7c0 .213.154.451.443.59A4.5 4.5 0 0112.5 13v1h1a.5.5 0 010 1h-11a.5.5 0 110-1h1v-1a4.5 4.5 0 012.557-4.06c.29-.139.443-.377.443-.59v-.7c0-.213-.154-.451-.443-.59A4.5 4.5 0 013.5 3V2h-1a.5.5 0 01-.5-.5zm2.5.5v1a3.5 3.5 0 001.989 3.158c.533.256 1.011.791 1.011 1.491v.702c0 .7-.478 1.235-1.011 1.491A3.5 3.5 0 004.5 13v1h7v-1a3.5 3.5 0 00-1.989-3.158C8.978 9.586 8.5 9.052 8.5 8.351v-.702c0-.7.478-1.235 1.011-1.491A3.5 3.5 0 0011.5 3V2h-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hourglass-bottom" fill="currentColor" id="hourglass-bottom" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 1.5a.5.5 0 01.5-.5h11a.5.5 0 010 1h-1v1a4.5 4.5 0 01-2.557 4.06c-.29.139-.443.377-.443.59v.7c0 .213.154.451.443.59A4.5 4.5 0 0112.5 13v1h1a.5.5 0 010 1h-11a.5.5 0 110-1h1v-1a4.5 4.5 0 012.557-4.06c.29-.139.443-.377.443-.59v-.7c0-.213-.154-.451-.443-.59A4.5 4.5 0 013.5 3V2h-1a.5.5 0 01-.5-.5zm2.5.5v1a3.5 3.5 0 001.989 3.158c.533.256 1.011.791 1.011 1.491v.702s.18.149.5.149.5-.15.5-.15v-.7c0-.701.478-1.236 1.011-1.492A3.5 3.5 0 0011.5 3V2h-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hourglass-split" fill="currentColor" id="hourglass-split" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.5 15a.5.5 0 110-1h1v-1a4.5 4.5 0 012.557-4.06c.29-.139.443-.377.443-.59v-.7c0-.213-.154-.451-.443-.59A4.5 4.5 0 013.5 3V2h-1a.5.5 0 010-1h11a.5.5 0 010 1h-1v1a4.5 4.5 0 01-2.557 4.06c-.29.139-.443.377-.443.59v.7c0 .213.154.451.443.59A4.5 4.5 0 0112.5 13v1h1a.5.5 0 010 1h-11zm2-13v1c0 .537.12 1.045.337 1.5h6.326c.216-.455.337-.963.337-1.5V2h-7zm3 6.35c0 .701-.478 1.236-1.011 1.492A3.5 3.5 0 004.5 13s.866-1.299 3-1.48V8.35zm1 0c0 .701.478 1.236 1.011 1.492A3.5 3.5 0 0111.5 13s-.866-1.299-3-1.48V8.35z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hourglass-top" fill="currentColor" id="hourglass-top" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 14.5a.5.5 0 00.5.5h11a.5.5 0 100-1h-1v-1a4.5 4.5 0 00-2.557-4.06c-.29-.139-.443-.377-.443-.59v-.7c0-.213.154-.451.443-.59A4.5 4.5 0 0012.5 3V2h1a.5.5 0 000-1h-11a.5.5 0 000 1h1v1a4.5 4.5 0 002.557 4.06c.29.139.443.377.443.59v.7c0 .213-.154.451-.443.59A4.5 4.5 0 003.5 13v1h-1a.5.5 0 00-.5.5zm2.5-.5v-1a3.5 3.5 0 011.989-3.158c.533-.256 1.011-.79 1.011-1.491v-.702s.18.101.5.101.5-.1.5-.1v.7c0 .701.478 1.236 1.011 1.492A3.5 3.5 0 0111.5 13v1h-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-house" fill="currentColor" id="house" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 13.5V7h1v6.5a.5.5 0 00.5.5h9a.5.5 0 00.5-.5V7h1v6.5a1.5 1.5 0 01-1.5 1.5h-9A1.5 1.5 0 012 13.5zm11-11V6l-2-2V2.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5z"/><path fill-rule="evenodd" d="M7.293 1.5a1 1 0 011.414 0l6.647 6.646a.5.5 0 01-.708.708L8 2.207 1.354 8.854a.5.5 0 11-.708-.708L7.293 1.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-house-door" fill="currentColor" id="house-door" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.646 1.146a.5.5 0 01.708 0l6 6a.5.5 0 01.146.354v7a.5.5 0 01-.5.5H9.5a.5.5 0 01-.5-.5v-4H7v4a.5.5 0 01-.5.5H2a.5.5 0 01-.5-.5v-7a.5.5 0 01.146-.354l6-6zM2.5 7.707V14H6v-4a.5.5 0 01.5-.5h3a.5.5 0 01.5.5v4h3.5V7.707L8 2.207l-5.5 5.5z"/><path fill-rule="evenodd" d="M13 2.5V6l-2-2V2.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-house-door-fill" fill="currentColor" id="house-door-fill" xmlns="http://www.w3.org/2000/svg"><path d="M6.5 10.995V14.5a.5.5 0 01-.5.5H2a.5.5 0 01-.5-.5v-7a.5.5 0 01.146-.354l6-6a.5.5 0 01.708 0l6 6a.5.5 0 01.146.354v7a.5.5 0 01-.5.5h-4a.5.5 0 01-.5-.5V11c0-.25-.25-.5-.5-.5H7c-.25 0-.5.25-.5.495z"/><path fill-rule="evenodd" d="M13 2.5V6l-2-2V2.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-house-fill" fill="currentColor" id="house-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 3.293l6 6V13.5a1.5 1.5 0 01-1.5 1.5h-9A1.5 1.5 0 012 13.5V9.293l6-6zm5-.793V6l-2-2V2.5a.5.5 0 01.5-.5h1a.5.5 0 01.5.5z"/><path fill-rule="evenodd" d="M7.293 1.5a1 1 0 011.414 0l6.647 6.646a.5.5 0 01-.708.708L8 2.207 1.354 8.854a.5.5 0 11-.708-.708L7.293 1.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-hr" fill="currentColor" id="hr" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 8a.5.5 0 01.5-.5h15a.5.5 0 010 1H.5A.5.5 0 010 8z"/><path d="M4 3h8a1 1 0 011 1v2.5h1V4a2 2 0 00-2-2H4a2 2 0 00-2 2v2.5h1V4a1 1 0 011-1zM3 9.5H2V12a2 2 0 002 2h8a2 2 0 002-2V9.5h-1V12a1 1 0 01-1 1H4a1 1 0 01-1-1V9.5z"/></symbol><symbol viewBox="0 0 17 16" class="bi bi-image" fill="currentColor" id="image" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.002 2h-12a1 1 0 00-1 1v9l2.646-2.354a.5.5 0 01.63-.062l2.66 1.773 3.71-3.71a.5.5 0 01.577-.094L15.002 9.5V3a1 1 0 00-1-1zm-12-1a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V3a2 2 0 00-2-2h-12zm4 4.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/></symbol><symbol viewBox="0 0 17 16" class="bi bi-image-alt" fill="currentColor" id="image-alt" xmlns="http://www.w3.org/2000/svg"><path d="M10.648 6.646a.5.5 0 01.577-.093l4.777 3.947V15a1 1 0 01-1 1h-14a1 1 0 01-1-1v-2l3.646-4.354a.5.5 0 01.63-.062l2.66 2.773 3.71-4.71z"/><path fill-rule="evenodd" d="M4.5 5a2.5 2.5 0 100-5 2.5 2.5 0 000 5z"/></symbol><symbol viewBox="0 0 17 16" class="bi bi-image-fill" fill="currentColor" id="image-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.002 3a2 2 0 012-2h12a2 2 0 012 2v10a2 2 0 01-2 2h-12a2 2 0 01-2-2V3zm1 9l2.646-2.354a.5.5 0 01.63-.062l2.66 1.773 3.71-3.71a.5.5 0 01.577-.094L15.002 9.5V13a1 1 0 01-1 1h-12a1 1 0 01-1-1v-1zm5-6.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-images" fill="currentColor" id="images" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12.002 4h-10a1 1 0 00-1 1v8l2.646-2.354a.5.5 0 01.63-.062l2.66 1.773 3.71-3.71a.5.5 0 01.577-.094l1.777 1.947V5a1 1 0 00-1-1zm-10-1a2 2 0 00-2 2v8a2 2 0 002 2h10a2 2 0 002-2V5a2 2 0 00-2-2h-10zm4 4.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/><path fill-rule="evenodd" d="M4 2h10a1 1 0 011 1v8a1 1 0 01-1 1v1a2 2 0 002-2V3a2 2 0 00-2-2H4a2 2 0 00-2 2h1a1 1 0 011-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-inbox" fill="currentColor" id="inbox" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.98 4a.5.5 0 00-.39.188L1.54 8H6a.5.5 0 01.5.5 1.5 1.5 0 103 0A.5.5 0 0110 8h4.46l-3.05-3.812A.5.5 0 0011.02 4H4.98zm9.954 5H10.45a2.5 2.5 0 01-4.9 0H1.066l.32 2.562a.5.5 0 00.497.438h12.234a.5.5 0 00.496-.438L14.933 9zM3.809 3.563A1.5 1.5 0 014.981 3h6.038a1.5 1.5 0 011.172.563l3.7 4.625a.5.5 0 01.105.374l-.39 3.124A1.5 1.5 0 0114.117 13H1.883a1.5 1.5 0 01-1.489-1.314l-.39-3.124a.5.5 0 01.106-.374l3.7-4.625z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-inbox-fill" fill="currentColor" id="inbox-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.98 4a.5.5 0 00-.39.188L1.54 8H6a.5.5 0 01.5.5 1.5 1.5 0 103 0A.5.5 0 0110 8h4.46l-3.05-3.812A.5.5 0 0011.02 4H4.98zm-1.17-.437A1.5 1.5 0 014.98 3h6.04a1.5 1.5 0 011.17.563l3.7 4.625a.5.5 0 01.106.374l-.39 3.124A1.5 1.5 0 0114.117 13H1.883a1.5 1.5 0 01-1.489-1.314l-.39-3.124a.5.5 0 01.106-.374l3.7-4.625z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-inboxes" fill="currentColor" id="inboxes" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.98 1a.5.5 0 00-.39.188L1.54 5H6a.5.5 0 01.5.5 1.5 1.5 0 003 0A.5.5 0 0110 5h4.46l-3.05-3.812A.5.5 0 0011.02 1H4.98zm9.954 5H10.45a2.5 2.5 0 01-4.9 0H1.066l.32 2.562A.5.5 0 001.884 9h12.234a.5.5 0 00.496-.438L14.933 6zM3.809.563A1.5 1.5 0 014.981 0h6.038a1.5 1.5 0 011.172.563l3.7 4.625a.5.5 0 01.105.374l-.39 3.124A1.5 1.5 0 0114.117 10H1.883A1.5 1.5 0 01.394 8.686l-.39-3.124a.5.5 0 01.106-.374L3.81.563zM.125 11.17A.5.5 0 01.5 11H6a.5.5 0 01.5.5 1.5 1.5 0 003 0 .5.5 0 01.5-.5h5.5a.5.5 0 01.496.562l-.39 3.124A1.5 1.5 0 0114.117 16H1.883a1.5 1.5 0 01-1.489-1.314l-.39-3.124a.5.5 0 01.121-.393zm.941.83l.32 2.562a.5.5 0 00.497.438h12.234a.5.5 0 00.496-.438l.32-2.562H10.45a2.5 2.5 0 01-4.9 0H1.066z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-inboxes-fill" fill="currentColor" id="inboxes-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.98 1a.5.5 0 00-.39.188L1.54 5H6a.5.5 0 01.5.5 1.5 1.5 0 003 0A.5.5 0 0110 5h4.46l-3.05-3.812A.5.5 0 0011.02 1H4.98zM3.81.563A1.5 1.5 0 014.98 0h6.04a1.5 1.5 0 011.17.563l3.7 4.625a.5.5 0 01.106.374l-.39 3.124A1.5 1.5 0 0114.117 10H1.883A1.5 1.5 0 01.394 8.686l-.39-3.124a.5.5 0 01.106-.374L3.81.563zM.125 11.17A.5.5 0 01.5 11H6a.5.5 0 01.5.5 1.5 1.5 0 003 0 .5.5 0 01.5-.5h5.5a.5.5 0 01.496.562l-.39 3.124A1.5 1.5 0 0114.117 16H1.883a1.5 1.5 0 01-1.489-1.314l-.39-3.124a.5.5 0 01.121-.393z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-info" fill="currentColor" id="info" xmlns="http://www.w3.org/2000/svg"><path d="M8.93 6.588l-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588z"/><circle cx="8" cy="4.5" r="1"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-info-circle" fill="currentColor" id="info-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path d="M8.93 6.588l-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588z"/><circle cx="8" cy="4.5" r="1"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-info-circle-fill" fill="currentColor" id="info-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 16A8 8 0 108 0a8 8 0 000 16zm.93-9.412l-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM8 5.5a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-info-square" fill="currentColor" id="info-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path d="M8.93 6.588l-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588z"/><circle cx="8" cy="4.5" r="1"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-info-square-fill" fill="currentColor" id="info-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v12a2 2 0 01-2 2H2a2 2 0 01-2-2V2zm8.93 4.588l-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM8 5.5a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-input-cursor" fill="currentColor" id="input-cursor" xmlns="http://www.w3.org/2000/svg"><path d="M10 5h4a1 1 0 011 1v4a1 1 0 01-1 1h-4v1h4a2 2 0 002-2V6a2 2 0 00-2-2h-4v1zM6 5V4H2a2 2 0 00-2 2v4a2 2 0 002 2h4v-1H2a1 1 0 01-1-1V6a1 1 0 011-1h4z"/><path fill-rule="evenodd" d="M8 1a.5.5 0 01.5.5v13a.5.5 0 01-1 0v-13A.5.5 0 018 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-input-cursor-text" fill="currentColor" id="input-cursor-text" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 2a.5.5 0 01.5-.5c.862 0 1.573.287 2.06.566.174.099.321.198.44.286.119-.088.266-.187.44-.286A4.165 4.165 0 0110.5 1.5a.5.5 0 010 1c-.638 0-1.177.213-1.564.434a3.49 3.49 0 00-.436.294V7.5H9a.5.5 0 010 1h-.5v4.272c.1.08.248.187.436.294.387.221.926.434 1.564.434a.5.5 0 010 1 4.165 4.165 0 01-2.06-.566A4.561 4.561 0 018 13.65a4.561 4.561 0 01-.44.285 4.165 4.165 0 01-2.06.566.5.5 0 010-1c.638 0 1.177-.213 1.564-.434.188-.107.335-.214.436-.294V8.5H7a.5.5 0 010-1h.5V3.228a3.49 3.49 0 00-.436-.294A3.166 3.166 0 005.5 2.5.5.5 0 015 2z"/><path d="M10 5h4a1 1 0 011 1v4a1 1 0 01-1 1h-4v1h4a2 2 0 002-2V6a2 2 0 00-2-2h-4v1zM6 5V4H2a2 2 0 00-2 2v4a2 2 0 002 2h4v-1H2a1 1 0 01-1-1V6a1 1 0 011-1h4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-intersect" fill="currentColor" id="intersect" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h8a2 2 0 012 2v2h2a2 2 0 012 2v8a2 2 0 01-2 2H6a2 2 0 01-2-2v-2H2a2 2 0 01-2-2V2zm5 10v2a1 1 0 001 1h8a1 1 0 001-1V6a1 1 0 00-1-1h-2v5a2 2 0 01-2 2H5zm6-8H6a2 2 0 00-2 2v5H2a1 1 0 01-1-1V2a1 1 0 011-1h8a1 1 0 011 1v2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal" fill="currentColor" id="journal" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal-album" fill="currentColor" id="journal-album" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm4-6.5a.5.5 0 01.5-.5h5a.5.5 0 01.5.5v5a.5.5 0 01-.5.5h-5a.5.5 0 01-.5-.5v-5z"/><path fill-rule="evenodd" d="M6 11.5a.5.5 0 01.5-.5h3a.5.5 0 010 1h-3a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal-arrow-down" fill="currentColor" id="journal-arrow-down" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/><path fill-rule="evenodd" d="M8 5a.5.5 0 01.5.5v3.793l1.146-1.147a.5.5 0 01.708.708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 11.708-.708L7.5 9.293V5.5A.5.5 0 018 5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal-arrow-up" fill="currentColor" id="journal-arrow-up" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/><path fill-rule="evenodd" d="M8 11a.5.5 0 00.5-.5V6.707l1.146 1.147a.5.5 0 00.708-.708l-2-2a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L7.5 6.707V10.5a.5.5 0 00.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal-check" fill="currentColor" id="journal-check" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/><path fill-rule="evenodd" d="M10.854 6.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 11.708-.708L7.5 8.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal-code" fill="currentColor" id="journal-code" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/><path fill-rule="evenodd" d="M8.646 5.646a.5.5 0 01.708 0l2 2a.5.5 0 010 .708l-2 2a.5.5 0 01-.708-.708L10.293 8 8.646 6.354a.5.5 0 010-.708zm-1.292 0a.5.5 0 00-.708 0l-2 2a.5.5 0 000 .708l2 2a.5.5 0 00.708-.708L5.707 8l1.647-1.646a.5.5 0 000-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal-medical" fill="currentColor" id="journal-medical" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/><path fill-rule="evenodd" d="M8 4a.5.5 0 01.5.5v.634l.549-.317a.5.5 0 11.5.866L9 6l.549.317a.5.5 0 11-.5.866L8.5 6.866V7.5a.5.5 0 01-1 0v-.634l-.549.317a.5.5 0 11-.5-.866L7 6l-.549-.317a.5.5 0 01.5-.866l.549.317V4.5A.5.5 0 018 4zM5 9.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal-minus" fill="currentColor" id="journal-minus" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/><path fill-rule="evenodd" d="M5.5 8a.5.5 0 01.5-.5h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal-plus" fill="currentColor" id="journal-plus" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/><path fill-rule="evenodd" d="M8 5.5a.5.5 0 01.5.5v1.5H10a.5.5 0 010 1H8.5V10a.5.5 0 01-1 0V8.5H6a.5.5 0 010-1h1.5V6a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal-richtext" fill="currentColor" id="journal-richtext" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/><path fill-rule="evenodd" d="M5 11.5a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5zm0-2a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm1.639-4.208l1.33.886 1.854-1.855a.25.25 0 01.289-.047L11 4.75V7a.5.5 0 01-.5.5h-5A.5.5 0 015 7v-.5s1.54-1.274 1.639-1.208zM6.75 4.5a.75.75 0 100-1.5.75.75 0 000 1.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal-text" fill="currentColor" id="journal-text" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/><path fill-rule="evenodd" d="M5 10.5a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5zm0-2a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0-2a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0-2a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journal-x" fill="currentColor" id="journal-x" xmlns="http://www.w3.org/2000/svg"><path d="M3 0h10a2 2 0 012 2v12a2 2 0 01-2 2H3a2 2 0 01-2-2v-1h1v1a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3a1 1 0 00-1 1v1H1V2a2 2 0 012-2z"/><path d="M1 5v-.5a.5.5 0 011 0V5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V8h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/><path fill-rule="evenodd" d="M6.146 6.146a.5.5 0 01.708 0L8 7.293l1.146-1.147a.5.5 0 11.708.708L8.707 8l1.147 1.146a.5.5 0 01-.708.708L8 8.707 6.854 9.854a.5.5 0 01-.708-.708L7.293 8 6.146 6.854a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-journals" fill="currentColor" id="journals" xmlns="http://www.w3.org/2000/svg"><path d="M3 2h8a2 2 0 012 2v10a2 2 0 01-2 2H3a2 2 0 01-2-2h1a1 1 0 001 1h8a1 1 0 001-1V4a1 1 0 00-1-1H3a1 1 0 00-1 1H1a2 2 0 012-2z"/><path d="M5 0h8a2 2 0 012 2v10a2 2 0 01-2 2v-1a1 1 0 001-1V2a1 1 0 00-1-1H5a1 1 0 00-1 1H3a2 2 0 012-2zM1 6v-.5a.5.5 0 011 0V6h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0V9h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1zm0 3v-.5a.5.5 0 011 0v.5h.5a.5.5 0 010 1h-2a.5.5 0 010-1H1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-joystick" fill="currentColor" id="joystick" xmlns="http://www.w3.org/2000/svg"><path d="M7.106 15.553L.553 12.276A1 1 0 010 11.382V9.471a1 1 0 01.606-.89L6 6.269v1.088L1 9.5l5.658 2.83a3 3 0 002.684 0L15 9.5l-5-2.143V6.27l5.394 2.312a1 1 0 01.606.89v1.911a1 1 0 01-.553.894l-6.553 3.277a2 2 0 01-1.788 0z"/><path fill-rule="evenodd" d="M7.5 9.5v-6h1v6h-1z"/><path d="M10 9.75c0 .414-.895.75-2 .75s-2-.336-2-.75S6.895 9 8 9s2 .336 2 .75zM10 2a2 2 0 11-4 0 2 2 0 014 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-justify" fill="currentColor" id="justify" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 12.5a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-justify-left" fill="currentColor" id="justify-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 12.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-justify-right" fill="currentColor" id="justify-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 12.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm-4-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-kanban" fill="currentColor" id="kanban" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13.5 1h-11a1 1 0 00-1 1v12a1 1 0 001 1h11a1 1 0 001-1V2a1 1 0 00-1-1zm-11-1a2 2 0 00-2 2v12a2 2 0 002 2h11a2 2 0 002-2V2a2 2 0 00-2-2h-11z"/><path d="M6.5 3a1 1 0 011-1h1a1 1 0 011 1v3a1 1 0 01-1 1h-1a1 1 0 01-1-1V3zm-4 0a1 1 0 011-1h1a1 1 0 011 1v7a1 1 0 01-1 1h-1a1 1 0 01-1-1V3zm8 0a1 1 0 011-1h1a1 1 0 011 1v10a1 1 0 01-1 1h-1a1 1 0 01-1-1V3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-kanban-fill" fill="currentColor" id="kanban-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.5 0a2 2 0 00-2 2v12a2 2 0 002 2h11a2 2 0 002-2V2a2 2 0 00-2-2h-11zm5 2a1 1 0 00-1 1v3a1 1 0 001 1h1a1 1 0 001-1V3a1 1 0 00-1-1h-1zm-5 1a1 1 0 011-1h1a1 1 0 011 1v7a1 1 0 01-1 1h-1a1 1 0 01-1-1V3zm9-1a1 1 0 00-1 1v10a1 1 0 001 1h1a1 1 0 001-1V3a1 1 0 00-1-1h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-key" fill="currentColor" id="key" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 8a4 4 0 017.465-2H14a.5.5 0 01.354.146l1.5 1.5a.5.5 0 010 .708l-1.5 1.5a.5.5 0 01-.708 0L13 9.207l-.646.647a.5.5 0 01-.708 0L11 9.207l-.646.647a.5.5 0 01-.708 0L9 9.207l-.646.647A.5.5 0 018 10h-.535A4 4 0 010 8zm4-3a3 3 0 102.712 4.285A.5.5 0 017.163 9h.63l.853-.854a.5.5 0 01.708 0l.646.647.646-.647a.5.5 0 01.708 0l.646.647.646-.647a.5.5 0 01.708 0l.646.647.793-.793-1-1h-6.63a.5.5 0 01-.451-.285A3 3 0 004 5z"/><path d="M4 8a1 1 0 11-2 0 1 1 0 012 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-key-fill" fill="currentColor" id="key-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 11.5a3.5 3.5 0 113.163-5H14L15.5 8 14 9.5l-1-1-1 1-1-1-1 1-1-1-1 1H6.663a3.5 3.5 0 01-3.163 2zM2.5 9a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-keyboard" fill="currentColor" id="keyboard" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 5H2a1 1 0 00-1 1v5a1 1 0 001 1h12a1 1 0 001-1V6a1 1 0 00-1-1zM2 4a2 2 0 00-2 2v5a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2H2z"/><path d="M13 10.25a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5a.25.25 0 01-.25-.25v-.5zm0-2a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5a.25.25 0 01-.25-.25v-.5zm-5 0A.25.25 0 018.25 8h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5A.25.25 0 018 8.75v-.5zm2 0a.25.25 0 01.25-.25h1.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-1.5a.25.25 0 01-.25-.25v-.5zm1 2a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5a.25.25 0 01-.25-.25v-.5zm-5-2A.25.25 0 016.25 8h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5A.25.25 0 016 8.75v-.5zm-2 0A.25.25 0 014.25 8h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5A.25.25 0 014 8.75v-.5zm-2 0A.25.25 0 012.25 8h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5A.25.25 0 012 8.75v-.5zm11-2a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5a.25.25 0 01-.25-.25v-.5zm-2 0a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5a.25.25 0 01-.25-.25v-.5zm-2 0A.25.25 0 019.25 6h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5A.25.25 0 019 6.75v-.5zm-2 0A.25.25 0 017.25 6h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5A.25.25 0 017 6.75v-.5zm-2 0A.25.25 0 015.25 6h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5A.25.25 0 015 6.75v-.5zm-3 0A.25.25 0 012.25 6h1.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-1.5A.25.25 0 012 6.75v-.5zm0 4a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5a.25.25 0 01-.25-.25v-.5zm2 0a.25.25 0 01.25-.25h5.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-5.5a.25.25 0 01-.25-.25v-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-keyboard-fill" fill="currentColor" id="keyboard-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 6a2 2 0 012-2h12a2 2 0 012 2v5a2 2 0 01-2 2H2a2 2 0 01-2-2V6zm13 .25a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5a.25.25 0 01-.25-.25v-.5zM2.25 8a.25.25 0 00-.25.25v.5c0 .138.112.25.25.25h.5A.25.25 0 003 8.75v-.5A.25.25 0 002.75 8h-.5zM4 8.25A.25.25 0 014.25 8h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5A.25.25 0 014 8.75v-.5zM6.25 8a.25.25 0 00-.25.25v.5c0 .138.112.25.25.25h.5A.25.25 0 007 8.75v-.5A.25.25 0 006.75 8h-.5zM8 8.25A.25.25 0 018.25 8h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5A.25.25 0 018 8.75v-.5zM13.25 8a.25.25 0 00-.25.25v.5c0 .138.112.25.25.25h.5a.25.25 0 00.25-.25v-.5a.25.25 0 00-.25-.25h-.5zm0 2a.25.25 0 00-.25.25v.5c0 .138.112.25.25.25h.5a.25.25 0 00.25-.25v-.5a.25.25 0 00-.25-.25h-.5zm-3-2a.25.25 0 00-.25.25v.5c0 .138.112.25.25.25h1.5a.25.25 0 00.25-.25v-.5a.25.25 0 00-.25-.25h-1.5zm.75 2.25a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5a.25.25 0 01-.25-.25v-.5zM11.25 6a.25.25 0 00-.25.25v.5c0 .138.112.25.25.25h.5a.25.25 0 00.25-.25v-.5a.25.25 0 00-.25-.25h-.5zM9 6.25A.25.25 0 019.25 6h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5A.25.25 0 019 6.75v-.5zM7.25 6a.25.25 0 00-.25.25v.5c0 .138.112.25.25.25h.5A.25.25 0 008 6.75v-.5A.25.25 0 007.75 6h-.5zM5 6.25A.25.25 0 015.25 6h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5A.25.25 0 015 6.75v-.5zM2.25 6a.25.25 0 00-.25.25v.5c0 .138.112.25.25.25h1.5A.25.25 0 004 6.75v-.5A.25.25 0 003.75 6h-1.5zM2 10.25a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v.5a.25.25 0 01-.25.25h-.5a.25.25 0 01-.25-.25v-.5zM4.25 10a.25.25 0 00-.25.25v.5c0 .138.112.25.25.25h5.5a.25.25 0 00.25-.25v-.5a.25.25 0 00-.25-.25h-5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-ladder" fill="currentColor" id="ladder" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.5 1a.5.5 0 01.5.5V2h6v-.5a.5.5 0 011 0v14a.5.5 0 01-1 0V15H5v.5a.5.5 0 01-1 0v-14a.5.5 0 01.5-.5zM5 14h6v-2H5v2zm0-3h6V9H5v2zm0-3h6V6H5v2zm0-3h6V3H5v2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-lamp" fill="currentColor" id="lamp" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13 3H3v4h10V3zM3 2a1 1 0 00-1 1v4a1 1 0 001 1h10a1 1 0 001-1V3a1 1 0 00-1-1H3zm4.5-1l.276-.553a.25.25 0 01.448 0L8.5 1h-1zm-.012 9c-.337.646-.677 1.33-.95 1.949-.176.396-.318.75-.413 1.042a3.904 3.904 0 00-.102.36c-.01.047-.016.083-.02.11L6 13.5c0 .665.717 1.5 2 1.5s2-.835 2-1.5c0 0 0-.013-.004-.039a1.347 1.347 0 00-.02-.11 3.696 3.696 0 00-.1-.36 11.747 11.747 0 00-.413-1.042A34.827 34.827 0 008.513 10H7.487zm1.627-1h-2.23C6.032 10.595 5 12.69 5 13.5 5 14.88 6.343 16 8 16s3-1.12 3-2.5c0-.81-1.032-2.905-1.885-4.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-lamp-fill" fill="currentColor" id="lamp-fill" xmlns="http://www.w3.org/2000/svg"><path d="M2 3a1 1 0 011-1h10a1 1 0 011 1v4a1 1 0 01-1 1H3a1 1 0 01-1-1V3z"/><path fill-rule="evenodd" d="M7.5 1l.276-.553a.25.25 0 01.448 0L8.5 1h-1zm-.615 8h2.23C9.968 10.595 11 12.69 11 13.5c0 1.38-1.343 2.5-3 2.5s-3-1.12-3-2.5c0-.81 1.032-2.905 1.885-4.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-laptop" fill="currentColor" id="laptop" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13.5 3h-11a.5.5 0 00-.5.5V11h12V3.5a.5.5 0 00-.5-.5zm-11-1A1.5 1.5 0 001 3.5V12h14V3.5A1.5 1.5 0 0013.5 2h-11z"/><path d="M0 12h16v.5a1.5 1.5 0 01-1.5 1.5h-13A1.5 1.5 0 010 12.5V12z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-laptop-fill" fill="currentColor" id="laptop-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.5 2A1.5 1.5 0 001 3.5V12h14V3.5A1.5 1.5 0 0013.5 2h-11z"/><path d="M0 12h16v.5a1.5 1.5 0 01-1.5 1.5h-13A1.5 1.5 0 010 12.5V12z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layers" fill="currentColor" id="layers" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.188 8L.264 9.559a.5.5 0 000 .882l7.5 4a.5.5 0 00.47 0l7.5-4a.5.5 0 000-.882L12.813 8l-1.063.567L14.438 10 8 13.433 1.562 10 4.25 8.567 3.187 8z"/><path fill-rule="evenodd" d="M7.765 1.559a.5.5 0 01.47 0l7.5 4a.5.5 0 010 .882l-7.5 4a.5.5 0 01-.47 0l-7.5-4a.5.5 0 010-.882l7.5-4zM1.563 6L8 9.433 14.438 6 8 2.567 1.562 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layers-fill" fill="currentColor" id="layers-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.765 1.559a.5.5 0 01.47 0l7.5 4a.5.5 0 010 .882l-7.5 4a.5.5 0 01-.47 0l-7.5-4a.5.5 0 010-.882l7.5-4z"/><path fill-rule="evenodd" d="M2.125 8.567l-1.86.992a.5.5 0 000 .882l7.5 4a.5.5 0 00.47 0l7.5-4a.5.5 0 000-.882l-1.86-.992-5.17 2.756a1.5 1.5 0 01-1.41 0l-5.17-2.756z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layers-half" fill="currentColor" id="layers-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.188 8L.264 9.559a.5.5 0 000 .882l7.5 4a.5.5 0 00.47 0l7.5-4a.5.5 0 000-.882L12.813 8l-4.578 2.441a.5.5 0 01-.47 0L3.188 8z"/><path fill-rule="evenodd" d="M7.765 1.559a.5.5 0 01.47 0l7.5 4a.5.5 0 010 .882l-7.5 4a.5.5 0 01-.47 0l-7.5-4a.5.5 0 010-.882l7.5-4zM1.563 6L8 9.433 14.438 6 8 2.567 1.562 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layout-sidebar" fill="currentColor" id="layout-sidebar" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 2H2a1 1 0 00-1 1v10a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1zM2 1a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V3a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M4 14V2h1v12H4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layout-sidebar-inset" fill="currentColor" id="layout-sidebar-inset" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 2H2a1 1 0 00-1 1v10a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1zM2 1a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V3a2 2 0 00-2-2H2z"/><path d="M3 4a1 1 0 011-1h2a1 1 0 011 1v8a1 1 0 01-1 1H4a1 1 0 01-1-1V4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layout-sidebar-inset-reverse" fill="currentColor" id="layout-sidebar-inset-reverse" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2h12a1 1 0 011 1v10a1 1 0 01-1 1H2a1 1 0 01-1-1V3a1 1 0 011-1zm12-1a2 2 0 012 2v10a2 2 0 01-2 2H2a2 2 0 01-2-2V3a2 2 0 012-2h12z"/><path d="M13 4a1 1 0 00-1-1h-2a1 1 0 00-1 1v8a1 1 0 001 1h2a1 1 0 001-1V4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layout-sidebar-reverse" fill="currentColor" id="layout-sidebar-reverse" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 2H2a1 1 0 00-1 1v10a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1zM2 1a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V3a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M11 14V2h1v12h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layout-split" fill="currentColor" id="layout-split" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 2H2a1 1 0 00-1 1v10a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1zM2 1a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V3a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M7.5 14V2h1v12h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layout-text-sidebar" fill="currentColor" id="layout-text-sidebar" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M11 15V1h1v14h-1zM3 3.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layout-text-sidebar-reverse" fill="currentColor" id="layout-text-sidebar-reverse" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 1h12a1 1 0 011 1v12a1 1 0 01-1 1H2a1 1 0 01-1-1V2a1 1 0 011-1zm12-1a2 2 0 012 2v12a2 2 0 01-2 2H2a2 2 0 01-2-2V2a2 2 0 012-2h12z"/><path fill-rule="evenodd" d="M5 15V1H4v14h1zm8-11.5a.5.5 0 00-.5-.5h-5a.5.5 0 000 1h5a.5.5 0 00.5-.5zm0 3a.5.5 0 00-.5-.5h-5a.5.5 0 000 1h5a.5.5 0 00.5-.5zm0 3a.5.5 0 00-.5-.5h-5a.5.5 0 000 1h5a.5.5 0 00.5-.5zm0 3a.5.5 0 00-.5-.5h-5a.5.5 0 000 1h5a.5.5 0 00.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layout-text-window" fill="currentColor" id="layout-text-window" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M11 15V4h1v11h-1zm4.5-11H.5V3h15v1zM3 6.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layout-text-window-reverse" fill="currentColor" id="layout-text-window-reverse" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 1h12a1 1 0 011 1v12a1 1 0 01-1 1H2a1 1 0 01-1-1V2a1 1 0 011-1zm12-1a2 2 0 012 2v12a2 2 0 01-2 2H2a2 2 0 01-2-2V2a2 2 0 012-2h12z"/><path fill-rule="evenodd" d="M5 15V4H4v11h1zM.5 4h15V3H.5v1zM13 6.5a.5.5 0 00-.5-.5h-5a.5.5 0 000 1h5a.5.5 0 00.5-.5zm0 3a.5.5 0 00-.5-.5h-5a.5.5 0 000 1h5a.5.5 0 00.5-.5zm0 3a.5.5 0 00-.5-.5h-5a.5.5 0 000 1h5a.5.5 0 00.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layout-three-columns" fill="currentColor" id="layout-three-columns" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2.5A1.5 1.5 0 011.5 1h13A1.5 1.5 0 0116 2.5v11a1.5 1.5 0 01-1.5 1.5h-13A1.5 1.5 0 010 13.5v-11zM1.5 2a.5.5 0 00-.5.5v11a.5.5 0 00.5.5h13a.5.5 0 00.5-.5v-11a.5.5 0 00-.5-.5h-13z"/><path fill-rule="evenodd" d="M5 15V1h1v14H5zm5 0V1h1v14h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-layout-wtf" fill="currentColor" id="layout-wtf" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 1H1v8h4V1zM1 0a1 1 0 00-1 1v8a1 1 0 001 1h4a1 1 0 001-1V1a1 1 0 00-1-1H1zm13 2H9v5h5V2zM9 1a1 1 0 00-1 1v5a1 1 0 001 1h5a1 1 0 001-1V2a1 1 0 00-1-1H9zM5 13H3v2h2v-2zm-2-1a1 1 0 00-1 1v2a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 00-1-1H3zm12-1H9v2h6v-2zm-6-1a1 1 0 00-1 1v2a1 1 0 001 1h6a1 1 0 001-1v-2a1 1 0 00-1-1H9z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-life-preserver" fill="currentColor" id="life-preserver" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.43 10.772l-2.788-1.115a4.015 4.015 0 01-1.985 1.985l1.115 2.788a7.025 7.025 0 003.658-3.658zM5.228 14.43l1.115-2.788a4.015 4.015 0 01-1.985-1.985L1.57 10.772a7.025 7.025 0 003.658 3.658zm9.202-9.202a7.025 7.025 0 00-3.658-3.658L9.657 4.358a4.015 4.015 0 011.985 1.985l2.788-1.115zm-8.087-.87L5.228 1.57A7.025 7.025 0 001.57 5.228l2.788 1.115a4.015 4.015 0 011.985-1.985zM8 16A8 8 0 108 0a8 8 0 000 16zm0-5a3 3 0 100-6 3 3 0 000 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-lightning" fill="currentColor" id="lightning" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.251.068a.5.5 0 01.227.58L9.677 6.5H13a.5.5 0 01.364.843l-8 8.5a.5.5 0 01-.842-.49L6.323 9.5H3a.5.5 0 01-.364-.843l8-8.5a.5.5 0 01.615-.09zM4.157 8.5H7a.5.5 0 01.478.647L6.11 13.59l5.732-6.09H9a.5.5 0 01-.478-.647L9.89 2.41 4.157 8.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-lightning-fill" fill="currentColor" id="lightning-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.251.068a.5.5 0 01.227.58L9.677 6.5H13a.5.5 0 01.364.843l-8 8.5a.5.5 0 01-.842-.49L6.323 9.5H3a.5.5 0 01-.364-.843l8-8.5a.5.5 0 01.615-.09z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-link" fill="currentColor" id="link" xmlns="http://www.w3.org/2000/svg"><path d="M6.354 5.5H4a3 3 0 000 6h3a3 3 0 002.83-4H9c-.086 0-.17.01-.25.031A2 2 0 017 10.5H4a2 2 0 110-4h1.535c.218-.376.495-.714.82-1z"/><path d="M9 5.5a3 3 0 00-2.83 4h1.098A2 2 0 019 6.5h3a2 2 0 110 4h-1.535a4.02 4.02 0 01-.82 1H12a3 3 0 100-6H9z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-link-45deg" fill="currentColor" id="link-45deg" xmlns="http://www.w3.org/2000/svg"><path d="M4.715 6.542L3.343 7.914a3 3 0 104.243 4.243l1.828-1.829A3 3 0 008.586 5.5L8 6.086a1.001 1.001 0 00-.154.199 2 2 0 01.861 3.337L6.88 11.45a2 2 0 11-2.83-2.83l.793-.792a4.018 4.018 0 01-.128-1.287z"/><path d="M6.586 4.672A3 3 0 007.414 9.5l.775-.776a2 2 0 01-.896-3.346L9.12 3.55a2 2 0 012.83 2.83l-.793.792c.112.42.155.855.128 1.287l1.372-1.372a3 3 0 00-4.243-4.243L6.586 4.672z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-list" fill="currentColor" id="list" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.5 11.5A.5.5 0 013 11h10a.5.5 0 010 1H3a.5.5 0 01-.5-.5zm0-4A.5.5 0 013 7h10a.5.5 0 010 1H3a.5.5 0 01-.5-.5zm0-4A.5.5 0 013 3h10a.5.5 0 010 1H3a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-list-check" fill="currentColor" id="list-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 11.5a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zM3.854 2.146a.5.5 0 010 .708l-1.5 1.5a.5.5 0 01-.708 0l-.5-.5a.5.5 0 11.708-.708L2 3.293l1.146-1.147a.5.5 0 01.708 0zm0 4a.5.5 0 010 .708l-1.5 1.5a.5.5 0 01-.708 0l-.5-.5a.5.5 0 11.708-.708L2 7.293l1.146-1.147a.5.5 0 01.708 0zm0 4a.5.5 0 010 .708l-1.5 1.5a.5.5 0 01-.708 0l-.5-.5a.5.5 0 01.708-.708l.146.147 1.146-1.147a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-list-nested" fill="currentColor" id="list-nested" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.5 11.5A.5.5 0 015 11h10a.5.5 0 010 1H5a.5.5 0 01-.5-.5zm-2-4A.5.5 0 013 7h10a.5.5 0 010 1H3a.5.5 0 01-.5-.5zm-2-4A.5.5 0 011 3h10a.5.5 0 010 1H1a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-list-ol" fill="currentColor" id="list-ol" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 11.5a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5z"/><path d="M1.713 11.865v-.474H2c.217 0 .363-.137.363-.317 0-.185-.158-.31-.361-.31-.223 0-.367.152-.373.31h-.59c.016-.467.373-.787.986-.787.588-.002.954.291.957.703a.595.595 0 01-.492.594v.033a.615.615 0 01.569.631c.003.533-.502.8-1.051.8-.656 0-1-.37-1.008-.794h.582c.008.178.186.306.422.309.254 0 .424-.145.422-.35-.002-.195-.155-.348-.414-.348h-.3zm-.004-4.699h-.604v-.035c0-.408.295-.844.958-.844.583 0 .96.326.96.756 0 .389-.257.617-.476.848l-.537.572v.03h1.054V9H1.143v-.395l.957-.99c.138-.142.293-.304.293-.508 0-.18-.147-.32-.342-.32a.33.33 0 00-.342.338v.041zM2.564 5h-.635V2.924h-.031l-.598.42v-.567l.629-.443h.635V5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-list-stars" fill="currentColor" id="list-stars" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 11.5a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5z"/><path d="M2.242 2.194a.27.27 0 01.516 0l.162.53c.035.115.14.194.258.194h.551c.259 0 .37.333.164.493l-.468.363a.277.277 0 00-.094.3l.173.569c.078.256-.213.462-.423.3l-.417-.324a.267.267 0 00-.328 0l-.417.323c-.21.163-.5-.043-.423-.299l.173-.57a.277.277 0 00-.094-.299l-.468-.363c-.206-.16-.095-.493.164-.493h.55a.271.271 0 00.259-.194l.162-.53zm0 4a.27.27 0 01.516 0l.162.53c.035.115.14.194.258.194h.551c.259 0 .37.333.164.493l-.468.363a.277.277 0 00-.094.3l.173.569c.078.255-.213.462-.423.3l-.417-.324a.267.267 0 00-.328 0l-.417.323c-.21.163-.5-.043-.423-.299l.173-.57a.277.277 0 00-.094-.299l-.468-.363c-.206-.16-.095-.493.164-.493h.55a.271.271 0 00.259-.194l.162-.53zm0 4a.27.27 0 01.516 0l.162.53c.035.115.14.194.258.194h.551c.259 0 .37.333.164.493l-.468.363a.277.277 0 00-.094.3l.173.569c.078.255-.213.462-.423.3l-.417-.324a.267.267 0 00-.328 0l-.417.323c-.21.163-.5-.043-.423-.299l.173-.57a.277.277 0 00-.094-.299l-.468-.363c-.206-.16-.095-.493.164-.493h.55a.271.271 0 00.259-.194l.162-.53z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-list-task" fill="currentColor" id="list-task" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5V3a.5.5 0 00-.5-.5H2zM3 3H2v1h1V3z"/><path d="M5 3.5a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zM5.5 7a.5.5 0 000 1h9a.5.5 0 000-1h-9zm0 4a.5.5 0 000 1h9a.5.5 0 000-1h-9z"/><path fill-rule="evenodd" d="M1.5 7a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v1a.5.5 0 01-.5.5H2a.5.5 0 01-.5-.5V7zM2 7h1v1H2V7zm0 3.5a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5H2zm1 .5H2v1h1v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-list-ul" fill="currentColor" id="list-ul" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 11.5a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zm-3 1a1 1 0 100-2 1 1 0 000 2zm0 4a1 1 0 100-2 1 1 0 000 2zm0 4a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-lock" fill="currentColor" id="lock" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.5 8h-7a1 1 0 00-1 1v5a1 1 0 001 1h7a1 1 0 001-1V9a1 1 0 00-1-1zm-7-1a2 2 0 00-2 2v5a2 2 0 002 2h7a2 2 0 002-2V9a2 2 0 00-2-2h-7zm0-3a3.5 3.5 0 117 0v3h-1V4a2.5 2.5 0 00-5 0v3h-1V4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-lock-fill" fill="currentColor" id="lock-fill" xmlns="http://www.w3.org/2000/svg"><path d="M2.5 9a2 2 0 012-2h7a2 2 0 012 2v5a2 2 0 01-2 2h-7a2 2 0 01-2-2V9z"/><path fill-rule="evenodd" d="M4.5 4a3.5 3.5 0 117 0v3h-1V4a2.5 2.5 0 00-5 0v3h-1V4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-mailbox" fill="currentColor" id="mailbox" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 4a3 3 0 00-3 3v6h6V7a3 3 0 00-3-3zm0-1h8a4 4 0 014 4v6a1 1 0 01-1 1H1a1 1 0 01-1-1V7a4 4 0 014-4zm2.646 1A3.99 3.99 0 018 7v6h7V7a3 3 0 00-3-3H6.646z"/><path fill-rule="evenodd" d="M11.793 8.5H9v-1h5a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-1a.5.5 0 01-.354-.146l-.853-.854z"/><path d="M5 7c0 .552-.448 0-1 0s-1 .552-1 0a1 1 0 012 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-mailbox2" fill="currentColor" id="mailbox2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 3H4a4 4 0 00-4 4v6a1 1 0 001 1h14a1 1 0 001-1V7a4 4 0 00-4-4zM8 7a3.99 3.99 0 00-1.354-3H12a3 3 0 013 3v6H8V7zm1 1.5h2.793l.853.854A.5.5 0 0013 9.5h1a.5.5 0 00.5-.5V8a.5.5 0 00-.5-.5H9v1zM4.585 7.157C4.836 7.264 5 7.334 5 7a1 1 0 00-2 0c0 .334.164.264.415.157C3.58 7.087 3.782 7 4 7c.218 0 .42.086.585.157z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-map" fill="currentColor" id="map" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15.817.113A.5.5 0 0116 .5v14a.5.5 0 01-.402.49l-5 1a.502.502 0 01-.196 0L5.5 15.01l-4.902.98A.5.5 0 010 15.5v-14a.5.5 0 01.402-.49l5-1a.5.5 0 01.196 0L10.5.99l4.902-.98a.5.5 0 01.415.103zM10 1.91l-4-.8v12.98l4 .8V1.91zm1 12.98l4-.8V1.11l-4 .8v12.98zm-6-.8V1.11l-4 .8v12.98l4-.8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-map-fill" fill="currentColor" id="map-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 .5a.5.5 0 00-.598-.49L10.5.99 5.598.01a.5.5 0 00-.196 0l-5 1A.5.5 0 000 1.5v14a.5.5 0 00.598.49l4.902-.98 4.902.98a.502.502 0 00.196 0l5-1A.5.5 0 0016 14.5V.5zM5 14.09V1.11l.5-.1.5.1v12.98l-.402-.08a.498.498 0 00-.196 0L5 14.09zm5 .8V1.91l.402.08a.5.5 0 00.196 0L11 1.91v12.98l-.5.1-.5-.1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-markdown" fill="currentColor" id="markdown" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 3H2a1 1 0 00-1 1v8a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1zM2 2a2 2 0 00-2 2v8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M9.146 8.146a.5.5 0 01.708 0L11.5 9.793l1.646-1.647a.5.5 0 01.708.708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 010-.708z"/><path fill-rule="evenodd" d="M11.5 5a.5.5 0 01.5.5v4a.5.5 0 01-1 0v-4a.5.5 0 01.5-.5z"/><path d="M3.56 11V7.01h.056l1.428 3.239h.774l1.42-3.24h.056V11h1.073V5.001h-1.2l-1.71 3.894h-.039l-1.71-3.894H2.5V11h1.06z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-markdown-fill" fill="currentColor" id="markdown-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 4a2 2 0 012-2h12a2 2 0 012 2v8a2 2 0 01-2 2H2a2 2 0 01-2-2V4zm11.5 1a.5.5 0 01.5.5v3.793l1.146-1.147a.5.5 0 01.708.708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 11.708-.708L11 9.293V5.5a.5.5 0 01.5-.5zM3.56 7.01V11H2.5V5.001h1.208l1.71 3.894h.04l1.709-3.894h1.2V11H7.294V7.01h-.057l-1.42 3.239h-.773l-1.428-3.24H3.56z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-menu-app" fill="currentColor" id="menu-app" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A1.5 1.5 0 011.5 0h2A1.5 1.5 0 015 1.5v2A1.5 1.5 0 013.5 5h-2A1.5 1.5 0 010 3.5v-2zM1.5 1a.5.5 0 00-.5.5v2a.5.5 0 00.5.5h2a.5.5 0 00.5-.5v-2a.5.5 0 00-.5-.5h-2zM14 7H2a1 1 0 00-1 1v5a1 1 0 001 1h12a1 1 0 001-1V8a1 1 0 00-1-1zM2 6a2 2 0 00-2 2v5a2 2 0 002 2h12a2 2 0 002-2V8a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M15 11H1v-1h14v1zM2 12.5a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-menu-app-fill" fill="currentColor" id="menu-app-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A1.5 1.5 0 011.5 0h2A1.5 1.5 0 015 1.5v2A1.5 1.5 0 013.5 5h-2A1.5 1.5 0 010 3.5v-2zM14 7H2a1 1 0 00-1 1v5a1 1 0 001 1h12a1 1 0 001-1V8a1 1 0 00-1-1zM2 6a2 2 0 00-2 2v5a2 2 0 002 2h12a2 2 0 002-2V8a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M15 11H1v-1h14v1zM2 12.5a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-menu-button" fill="currentColor" id="menu-button" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A1.5 1.5 0 011.5 0h8A1.5 1.5 0 0111 1.5v2A1.5 1.5 0 019.5 5h-8A1.5 1.5 0 010 3.5v-2zM1.5 1a.5.5 0 00-.5.5v2a.5.5 0 00.5.5h8a.5.5 0 00.5-.5v-2a.5.5 0 00-.5-.5h-8zM14 7H2a1 1 0 00-1 1v5a1 1 0 001 1h12a1 1 0 001-1V8a1 1 0 00-1-1zM2 6a2 2 0 00-2 2v5a2 2 0 002 2h12a2 2 0 002-2V8a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M15 11H1v-1h14v1zM2 12.5a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5z"/><path d="M7.823 2.823l-.396-.396A.25.25 0 017.604 2h.792a.25.25 0 01.177.427l-.396.396a.25.25 0 01-.354 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-menu-button-fill" fill="currentColor" id="menu-button-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 7H2a1 1 0 00-1 1v5a1 1 0 001 1h12a1 1 0 001-1V8a1 1 0 00-1-1zM2 6a2 2 0 00-2 2v5a2 2 0 002 2h12a2 2 0 002-2V8a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M15 11H1v-1h14v1zM2 12.5a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zM1.5 0A1.5 1.5 0 000 1.5v2A1.5 1.5 0 001.5 5h8A1.5 1.5 0 0011 3.5v-2A1.5 1.5 0 009.5 0h-8zm5.927 2.427l.396.396a.25.25 0 00.354 0l.396-.396A.25.25 0 008.396 2h-.792a.25.25 0 00-.177.427z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-menu-button-wide" fill="currentColor" id="menu-button-wide" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A1.5 1.5 0 011.5 0h13A1.5 1.5 0 0116 1.5v2A1.5 1.5 0 0114.5 5h-13A1.5 1.5 0 010 3.5v-2zM1.5 1a.5.5 0 00-.5.5v2a.5.5 0 00.5.5h13a.5.5 0 00.5-.5v-2a.5.5 0 00-.5-.5h-13zM14 7H2a1 1 0 00-1 1v5a1 1 0 001 1h12a1 1 0 001-1V8a1 1 0 00-1-1zM2 6a2 2 0 00-2 2v5a2 2 0 002 2h12a2 2 0 002-2V8a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M15 11H1v-1h14v1zM2 12.5a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0-10a.5.5 0 01.5-.5h3a.5.5 0 010 1h-3a.5.5 0 01-.5-.5zm0 6a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5z"/><path d="M12.823 2.823l-.396-.396A.25.25 0 0112.604 2h.792a.25.25 0 01.177.427l-.396.396a.25.25 0 01-.354 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-menu-button-wide-fill" fill="currentColor" id="menu-button-wide-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 7H2a1 1 0 00-1 1v5a1 1 0 001 1h12a1 1 0 001-1V8a1 1 0 00-1-1zM2 6a2 2 0 00-2 2v5a2 2 0 002 2h12a2 2 0 002-2V8a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M15 11H1v-1h14v1zM2 12.5a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h9a.5.5 0 010 1h-9a.5.5 0 01-.5-.5zM1.5 0A1.5 1.5 0 000 1.5v2A1.5 1.5 0 001.5 5h13A1.5 1.5 0 0016 3.5v-2A1.5 1.5 0 0014.5 0h-13zm1 2a.5.5 0 000 1h3a.5.5 0 000-1h-3zm9.927.427l.396.396a.25.25 0 00.354 0l.396-.396A.25.25 0 0013.396 2h-.792a.25.25 0 00-.177.427z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-menu-down" fill="currentColor" id="menu-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15 13V4a1 1 0 00-1-1h-3.586A2 2 0 019 2.414l-1-1-1 1A2 2 0 015.586 3H2a1 1 0 00-1 1v9a1 1 0 001 1h12a1 1 0 001-1zM2 2a2 2 0 00-2 2v9a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2h-3.586a1 1 0 01-.707-.293L8.354.354a.5.5 0 00-.708 0L6.293 1.707A1 1 0 015.586 2H2z"/><path fill-rule="evenodd" d="M15 11H1v-1h14v1zm0-4H1V6h14v1zM2 12.5a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm0-4a.5.5 0 01.5-.5h8a.5.5 0 010 1h-8a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-menu-up" fill="currentColor" id="menu-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15 3.207v9a1 1 0 01-1 1h-3.586A2 2 0 009 13.793l-1 1-1-1a2 2 0 00-1.414-.586H2a1 1 0 01-1-1v-9a1 1 0 011-1h12a1 1 0 011 1zm-13 11a2 2 0 01-2-2v-9a2 2 0 012-2h12a2 2 0 012 2v9a2 2 0 01-2 2h-3.586a1 1 0 00-.707.293l-1.353 1.354a.5.5 0 01-.708 0L6.293 14.5a1 1 0 00-.707-.293H2z"/><path fill-rule="evenodd" d="M15 5.207H1v1h14v-1zm0 4H1v1h14v-1zm-13-5.5a.5.5 0 00.5.5h6a.5.5 0 100-1h-6a.5.5 0 00-.5.5zm0 4a.5.5 0 00.5.5h11a.5.5 0 000-1h-11a.5.5 0 00-.5.5zm0 4a.5.5 0 00.5.5h8a.5.5 0 000-1h-8a.5.5 0 00-.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-mic" fill="currentColor" id="mic" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 6.5A.5.5 0 014 7v1a4 4 0 008 0V7a.5.5 0 011 0v1a5 5 0 01-4.5 4.975V15h3a.5.5 0 010 1h-7a.5.5 0 010-1h3v-2.025A5 5 0 013 8V7a.5.5 0 01.5-.5z"/><path fill-rule="evenodd" d="M10 8V3a2 2 0 10-4 0v5a2 2 0 104 0zM8 0a3 3 0 00-3 3v5a3 3 0 006 0V3a3 3 0 00-3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-mic-fill" fill="currentColor" id="mic-fill" xmlns="http://www.w3.org/2000/svg"><path d="M5 3a3 3 0 016 0v5a3 3 0 01-6 0V3z"/><path fill-rule="evenodd" d="M3.5 6.5A.5.5 0 014 7v1a4 4 0 008 0V7a.5.5 0 011 0v1a5 5 0 01-4.5 4.975V15h3a.5.5 0 010 1h-7a.5.5 0 010-1h3v-2.025A5 5 0 013 8V7a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-mic-mute" fill="currentColor" id="mic-mute" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12.734 9.613A4.995 4.995 0 0013 8V7a.5.5 0 00-1 0v1c0 .274-.027.54-.08.799l.814.814zm-2.522 1.72A4 4 0 014 8V7a.5.5 0 00-1 0v1a5 5 0 004.5 4.975V15h-3a.5.5 0 000 1h7a.5.5 0 000-1h-3v-2.025a4.973 4.973 0 002.43-.923l-.718-.719zM11 7.88V3a3 3 0 00-5.842-.963l.845.845A2 2 0 0110 3v3.879l1 1zM8.738 9.86l.748.748A3 3 0 015 8V6.121l1 1V8a2 2 0 002.738 1.86zm4.908 3.494l-12-12 .708-.708 12 12-.708.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-mic-mute-fill" fill="currentColor" id="mic-mute-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12.734 9.613A4.995 4.995 0 0013 8V7a.5.5 0 00-1 0v1c0 .274-.027.54-.08.799l.814.814zm-2.522 1.72A4 4 0 014 8V7a.5.5 0 00-1 0v1a5 5 0 004.5 4.975V15h-3a.5.5 0 000 1h7a.5.5 0 000-1h-3v-2.025a4.973 4.973 0 002.43-.923l-.718-.719zM11 7.88V3a3 3 0 00-5.842-.963L11 7.879zM5 6.12l4.486 4.486A3 3 0 015 8V6.121zm8.646 7.234l-12-12 .708-.708 12 12-.708.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-minecart" fill="currentColor" id="minecart" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 15a1 1 0 100-2 1 1 0 000 2zm0 1a2 2 0 100-4 2 2 0 000 4zm8-1a1 1 0 100-2 1 1 0 000 2zm0 1a2 2 0 100-4 2 2 0 000 4zM.115 3.18A.5.5 0 01.5 3h15a.5.5 0 01.491.592l-1.5 8A.5.5 0 0114 12H2a.5.5 0 01-.491-.408l-1.5-8a.5.5 0 01.106-.411zm.987.82l1.313 7h11.17l1.313-7H1.102z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-minecart-loaded" fill="currentColor" id="minecart-loaded" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 15a1 1 0 100-2 1 1 0 000 2zm0 1a2 2 0 100-4 2 2 0 000 4zm8-1a1 1 0 100-2 1 1 0 000 2zm0 1a2 2 0 100-4 2 2 0 000 4zM.115 3.18A.5.5 0 01.5 3h15a.5.5 0 01.491.592l-1.5 8A.5.5 0 0114 12H2a.5.5 0 01-.491-.408l-1.5-8a.5.5 0 01.106-.411zm.987.82l1.313 7h11.17l1.313-7H1.102z"/><path fill-rule="evenodd" d="M6 1a2.498 2.498 0 014 0c.818 0 1.545.394 2 1 .67 0 1.552.57 2 1h-2c-.314 0-.611-.15-.8-.4-.274-.365-.71-.6-1.2-.6-.314 0-.611-.15-.8-.4a1.497 1.497 0 00-2.4 0c-.189.25-.486.4-.8.4-.507 0-.955.251-1.228.638-.09.13-.194.25-.308.362H3c.13-.147.401-.432.562-.545a1.63 1.63 0 00.393-.393A2.498 2.498 0 016 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-moon" fill="currentColor" id="moon" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14.53 10.53a7 7 0 01-9.058-9.058A7.003 7.003 0 008 15a7.002 7.002 0 006.53-4.47z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-mouse" fill="currentColor" id="mouse" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 3a.5.5 0 01.5.5v2a.5.5 0 01-1 0v-2A.5.5 0 018 3zm4 8V5a4 4 0 00-8 0v6a4 4 0 008 0zM8 0a5 5 0 00-5 5v6a5 5 0 0010 0V5a5 5 0 00-5-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-mouse2" fill="currentColor" id="mouse2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 5.188C3 2.341 5.22 0 8 0s5 2.342 5 5.188v5.625C13 13.658 10.78 16 8 16s-5-2.342-5-5.188V5.189zm4.5-4.155C5.541 1.289 4 3.035 4 5.188V5.5h3.5V1.033zm1 0V5.5H12v-.313c0-2.152-1.541-3.898-3.5-4.154zM12 6.5H4v4.313C4 13.145 5.81 15 8 15s4-1.855 4-4.188V6.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-mouse3" fill="currentColor" id="mouse3" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.473.463C5.896.157 6.407 0 7 0c1.26 0 2.981.123 4.403.825.72.355 1.375.864 1.85 1.59.475.728.747 1.642.747 2.772v5.625C14 13.659 11.78 16 9 16H7c-2.78 0-5-2.342-5-5.188V8.236A2.5 2.5 0 013.382 6L4 5.691v-.503c0-1.31.124-2.569.543-3.517.213-.482.512-.906.93-1.208zM4.017 6.801l-.188.093A1.5 1.5 0 003 8.236v2.576C3 13.146 4.81 15 7 15h2c2.19 0 4-1.855 4-4.188V5.189c0-.964-.23-1.683-.585-2.226-.356-.546-.86-.947-1.454-1.24C9.754 1.127 8.226 1 7 1c-.407 0-.708.105-.941.274-.239.172-.44.435-.602.801C5.127 2.823 5 3.907 5 5.187v.844a16.734 16.734 0 00.008.448c.007.3.023.715.053 1.175.063.937.186 2.005.413 2.688a.5.5 0 11-.948.316c-.273-.817-.4-2-.462-2.937a27.75 27.75 0 01-.047-.92z"/><path fill-rule="evenodd" d="M9 .5a.5.5 0 01.5.5v5.099l4.108.913a.5.5 0 01-.216.976l-9-2a.5.5 0 11.216-.976l3.892.865V1A.5.5 0 019 .5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-music-note" fill="currentColor" id="music-note" xmlns="http://www.w3.org/2000/svg"><path d="M9 13c0 1.105-1.12 2-2.5 2S4 14.105 4 13s1.12-2 2.5-2 2.5.895 2.5 2z"/><path fill-rule="evenodd" d="M9 3v10H8V3h1z"/><path d="M8 2.82a1 1 0 01.804-.98l3-.6A1 1 0 0113 2.22V4L8 5V2.82z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-music-note-beamed" fill="currentColor" id="music-note-beamed" xmlns="http://www.w3.org/2000/svg"><path d="M6 13c0 1.105-1.12 2-2.5 2S1 14.105 1 13c0-1.104 1.12-2 2.5-2s2.5.896 2.5 2zm9-2c0 1.105-1.12 2-2.5 2s-2.5-.895-2.5-2 1.12-2 2.5-2 2.5.895 2.5 2z"/><path fill-rule="evenodd" d="M14 11V2h1v9h-1zM6 3v10H5V3h1z"/><path d="M5 2.905a1 1 0 01.9-.995l8-.8a1 1 0 011.1.995V3L5 4V2.905z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-music-note-list" fill="currentColor" id="music-note-list" xmlns="http://www.w3.org/2000/svg"><path d="M12 13c0 1.105-1.12 2-2.5 2S7 14.105 7 13s1.12-2 2.5-2 2.5.895 2.5 2z"/><path fill-rule="evenodd" d="M12 3v10h-1V3h1z"/><path d="M11 2.82a1 1 0 01.804-.98l3-.6A1 1 0 0116 2.22V4l-5 1V2.82z"/><path fill-rule="evenodd" d="M0 11.5a.5.5 0 01.5-.5H4a.5.5 0 010 1H.5a.5.5 0 01-.5-.5zm0-4A.5.5 0 01.5 7H8a.5.5 0 010 1H.5a.5.5 0 01-.5-.5zm0-4A.5.5 0 01.5 3H8a.5.5 0 010 1H.5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-music-player" fill="currentColor" id="music-player" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1zM4 0a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2H4z"/><path fill-rule="evenodd" d="M11 3H5v3h6V3zM5 2a1 1 0 00-1 1v3a1 1 0 001 1h6a1 1 0 001-1V3a1 1 0 00-1-1H5zm3 11a2 2 0 100-4 2 2 0 000 4zm3-2a3 3 0 11-6 0 3 3 0 016 0z"/><circle cx="8" cy="11" r="1"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-music-player-fill" fill="currentColor" id="music-player-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm2 1a1 1 0 011-1h6a1 1 0 011 1v2.5a1 1 0 01-1 1H5a1 1 0 01-1-1V3zm7 8a3 3 0 11-6 0 3 3 0 016 0z"/><circle cx="8" cy="11" r="1"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-newspaper" fill="currentColor" id="newspaper" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2.5A1.5 1.5 0 011.5 1h11A1.5 1.5 0 0114 2.5v10.528c0 .3-.05.654-.238.972h.738a.5.5 0 00.5-.5v-9a.5.5 0 011 0v9a1.5 1.5 0 01-1.5 1.5H1.497A1.497 1.497 0 010 13.5v-11zM12 14c.37 0 .654-.211.853-.441.092-.106.147-.279.147-.531V2.5a.5.5 0 00-.5-.5h-11a.5.5 0 00-.5.5v11c0 .278.223.5.497.5H12z"/><path d="M2 3h10v2H2V3zm0 3h4v3H2V6zm0 4h4v1H2v-1zm0 2h4v1H2v-1zm5-6h2v1H7V6zm3 0h2v1h-2V6zM7 8h2v1H7V8zm3 0h2v1h-2V8zm-3 2h2v1H7v-1zm3 0h2v1h-2v-1zm-3 2h2v1H7v-1zm3 0h2v1h-2v-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-node-minus" fill="currentColor" id="node-minus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11 4a4 4 0 100 8 4 4 0 000-8zM6.025 7.5a5 5 0 110 1H4A1.5 1.5 0 012.5 10h-1A1.5 1.5 0 010 8.5v-1A1.5 1.5 0 011.5 6h1A1.5 1.5 0 014 7.5h2.025zM1.5 7a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1zM8 8a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5A.5.5 0 018 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-node-minus-fill" fill="currentColor" id="node-minus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8a5 5 0 01-9.975.5H4A1.5 1.5 0 012.5 10h-1A1.5 1.5 0 010 8.5v-1A1.5 1.5 0 011.5 6h1A1.5 1.5 0 014 7.5h2.025A5 5 0 0116 8zm-2 0a.5.5 0 00-.5-.5h-5a.5.5 0 000 1h5A.5.5 0 0014 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-node-plus" fill="currentColor" id="node-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11 4a4 4 0 100 8 4 4 0 000-8zM6.025 7.5a5 5 0 110 1H4A1.5 1.5 0 012.5 10h-1A1.5 1.5 0 010 8.5v-1A1.5 1.5 0 011.5 6h1A1.5 1.5 0 014 7.5h2.025zM11 5a.5.5 0 01.5.5v2h2a.5.5 0 010 1h-2v2a.5.5 0 01-1 0v-2h-2a.5.5 0 010-1h2v-2A.5.5 0 0111 5zM1.5 7a.5.5 0 00-.5.5v1a.5.5 0 00.5.5h1a.5.5 0 00.5-.5v-1a.5.5 0 00-.5-.5h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-node-plus-fill" fill="currentColor" id="node-plus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11 13a5 5 0 10-4.975-5.5H4A1.5 1.5 0 002.5 6h-1A1.5 1.5 0 000 7.5v1A1.5 1.5 0 001.5 10h1A1.5 1.5 0 004 8.5h2.025A5 5 0 0011 13zm.5-7.5a.5.5 0 00-1 0v2h-2a.5.5 0 000 1h2v2a.5.5 0 001 0v-2h2a.5.5 0 000-1h-2v-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-nut" fill="currentColor" id="nut" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.42 2H4.58L1.152 8l3.428 6h6.84l3.428-6-3.428-6zM4.58 1a1 1 0 00-.868.504l-3.429 6a1 1 0 000 .992l3.429 6A1 1 0 004.58 15h6.84a1 1 0 00.868-.504l3.428-6a1 1 0 000-.992l-3.428-6A1 1 0 0011.42 1H4.58z"/><path fill-rule="evenodd" d="M6.848 5.933a2.5 2.5 0 102.5 4.33 2.5 2.5 0 00-2.5-4.33zM5.067 9.848a3.5 3.5 0 116.062-3.5 3.5 3.5 0 01-6.062 3.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-nut-fill" fill="currentColor" id="nut-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.58 1a1 1 0 00-.868.504l-3.429 6a1 1 0 000 .992l3.429 6A1 1 0 004.58 15h6.84a1 1 0 00.868-.504l3.428-6a1 1 0 000-.992l-3.428-6A1 1 0 0011.42 1H4.58zm5.018 9.696a3 3 0 10-3-5.196 3 3 0 003 5.196z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-octagon" fill="currentColor" id="octagon" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.54.146A.5.5 0 014.893 0h6.214a.5.5 0 01.353.146l4.394 4.394a.5.5 0 01.146.353v6.214a.5.5 0 01-.146.353l-4.394 4.394a.5.5 0 01-.353.146H4.893a.5.5 0 01-.353-.146L.146 11.46A.5.5 0 010 11.107V4.893a.5.5 0 01.146-.353L4.54.146zM5.1 1L1 5.1v5.8L5.1 15h5.8l4.1-4.1V5.1L10.9 1H5.1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-octagon-fill" fill="currentColor" id="octagon-fill" xmlns="http://www.w3.org/2000/svg"><path d="M11.107 0a.5.5 0 01.353.146l4.394 4.394a.5.5 0 01.146.353v6.214a.5.5 0 01-.146.353l-4.394 4.394a.5.5 0 01-.353.146H4.893a.5.5 0 01-.353-.146L.146 11.46A.5.5 0 010 11.107V4.893a.5.5 0 01.146-.353L4.54.146A.5.5 0 014.893 0h6.214z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-octagon-half" fill="currentColor" id="octagon-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.54.146A.5.5 0 014.893 0h6.214a.5.5 0 01.353.146l4.394 4.394a.5.5 0 01.146.353v6.214a.5.5 0 01-.146.353l-4.394 4.394a.5.5 0 01-.353.146H4.893a.5.5 0 01-.353-.146L.146 11.46A.5.5 0 010 11.107V4.893a.5.5 0 01.146-.353L4.54.146zM8 15h2.9l4.1-4.1V5.1L10.9 1H8v14z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-option" fill="currentColor" id="option" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 2.5a.5.5 0 01.5-.5h3.797a.5.5 0 01.439.26L11 13h3.5a.5.5 0 010 1h-3.797a.5.5 0 01-.439-.26L5 3H1.5a.5.5 0 01-.5-.5zm10 0a.5.5 0 01.5-.5h3a.5.5 0 010 1h-3a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-outlet" fill="currentColor" id="outlet" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.34 2.994c.275-.338.68-.494 1.074-.494h7.172c.393 0 .798.156 1.074.494.578.708 1.84 2.534 1.84 5.006 0 2.472-1.262 4.297-1.84 5.006-.276.338-.68.494-1.074.494H4.414c-.394 0-.799-.156-1.074-.494C2.762 12.297 1.5 10.472 1.5 8c0-2.472 1.262-4.297 1.84-5.006zm1.074.506a.376.376 0 00-.299.126C3.599 4.259 2.5 5.863 2.5 8c0 2.137 1.099 3.74 1.615 4.374.06.073.163.126.3.126h7.17c.137 0 .24-.053.3-.126.516-.633 1.615-2.237 1.615-4.374 0-2.137-1.099-3.74-1.615-4.374a.376.376 0 00-.3-.126h-7.17z"/><path fill-rule="evenodd" d="M6 5.5a.5.5 0 01.5.5v1.5a.5.5 0 01-1 0V6a.5.5 0 01.5-.5zm4 0a.5.5 0 01.5.5v1.5a.5.5 0 01-1 0V6a.5.5 0 01.5-.5z"/><path d="M7 10v1h2v-1a1 1 0 00-2 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-paperclip" fill="currentColor" id="paperclip" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.5 3a2.5 2.5 0 015 0v9a1.5 1.5 0 01-3 0V5a.5.5 0 011 0v7a.5.5 0 001 0V3a1.5 1.5 0 10-3 0v9a2.5 2.5 0 005 0V5a.5.5 0 011 0v7a3.5 3.5 0 11-7 0V3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-paragraph" fill="currentColor" id="paragraph" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1h4.5a.5.5 0 010 1H11v12.5a.5.5 0 01-1 0V2H9v12.5a.5.5 0 01-1 0V1z"/><path d="M9 1v8H7a4 4 0 110-8h2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-patch-check" fill="currentColor" id="patch-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.273 2.513l-.921-.944.715-.698.622.637.89-.011a2.89 2.89 0 012.924 2.924l-.01.89.636.622a2.89 2.89 0 010 4.134l-.637.622.011.89a2.89 2.89 0 01-2.924 2.924l-.89-.01-.622.636a2.89 2.89 0 01-4.134 0l-.622-.637-.89.011a2.89 2.89 0 01-2.924-2.924l.01-.89-.636-.622a2.89 2.89 0 010-4.134l.637-.622-.011-.89a2.89 2.89 0 012.924-2.924l.89.01.622-.636a2.89 2.89 0 014.134 0l-.715.698a1.89 1.89 0 00-2.704 0l-.92.944-1.32-.016a1.89 1.89 0 00-1.911 1.912l.016 1.318-.944.921a1.89 1.89 0 000 2.704l.944.92-.016 1.32a1.89 1.89 0 001.912 1.911l1.318-.016.921.944a1.89 1.89 0 002.704 0l.92-.944 1.32.016a1.89 1.89 0 001.911-1.912l-.016-1.318.944-.921a1.89 1.89 0 000-2.704l-.944-.92.016-1.32a1.89 1.89 0 00-1.912-1.911l-1.318.016z"/><path fill-rule="evenodd" d="M10.354 6.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 11.708-.708L7 8.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-patch-check-fll" fill="currentColor" id="patch-check-fll" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.067.87a2.89 2.89 0 00-4.134 0l-.622.638-.89-.011a2.89 2.89 0 00-2.924 2.924l.01.89-.636.622a2.89 2.89 0 000 4.134l.637.622-.011.89a2.89 2.89 0 002.924 2.924l.89-.01.622.636a2.89 2.89 0 004.134 0l.622-.637.89.011a2.89 2.89 0 002.924-2.924l-.01-.89.636-.622a2.89 2.89 0 000-4.134l-.637-.622.011-.89a2.89 2.89 0 00-2.924-2.924l-.89.01-.622-.636zm.287 5.984a.5.5 0 00-.708-.708L7 8.793 5.854 7.646a.5.5 0 10-.708.708l1.5 1.5a.5.5 0 00.708 0l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-patch-exclamation" fill="currentColor" id="patch-exclamation" xmlns="http://www.w3.org/2000/svg"><path d="M7.002 11a1 1 0 112 0 1 1 0 01-2 0zM7.1 4.995a.905.905 0 111.8 0l-.35 3.507a.552.552 0 01-1.1 0L7.1 4.995z"/><path fill-rule="evenodd" d="M10.273 2.513l-.921-.944.715-.698.622.637.89-.011a2.89 2.89 0 012.924 2.924l-.01.89.636.622a2.89 2.89 0 010 4.134l-.637.622.011.89a2.89 2.89 0 01-2.924 2.924l-.89-.01-.622.636a2.89 2.89 0 01-4.134 0l-.622-.637-.89.011a2.89 2.89 0 01-2.924-2.924l.01-.89-.636-.622a2.89 2.89 0 010-4.134l.637-.622-.011-.89a2.89 2.89 0 012.924-2.924l.89.01.622-.636a2.89 2.89 0 014.134 0l-.715.698a1.89 1.89 0 00-2.704 0l-.92.944-1.32-.016a1.89 1.89 0 00-1.911 1.912l.016 1.318-.944.921a1.89 1.89 0 000 2.704l.944.92-.016 1.32a1.89 1.89 0 001.912 1.911l1.318-.016.921.944a1.89 1.89 0 002.704 0l.92-.944 1.32.016a1.89 1.89 0 001.911-1.912l-.016-1.318.944-.921a1.89 1.89 0 000-2.704l-.944-.92.016-1.32a1.89 1.89 0 00-1.912-1.911l-1.318.016z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-patch-exclamation-fll" fill="currentColor" id="patch-exclamation-fll" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.067.87a2.89 2.89 0 00-4.134 0l-.622.638-.89-.011a2.89 2.89 0 00-2.924 2.924l.01.89-.636.622a2.89 2.89 0 000 4.134l.637.622-.011.89a2.89 2.89 0 002.924 2.924l.89-.01.622.636a2.89 2.89 0 004.134 0l.622-.637.89.011a2.89 2.89 0 002.924-2.924l-.01-.89.636-.622a2.89 2.89 0 000-4.134l-.637-.622.011-.89a2.89 2.89 0 00-2.924-2.924l-.89.01-.622-.636zM8 4a.905.905 0 00-.9.995l.35 3.507a.553.553 0 001.1 0l.35-3.507A.905.905 0 008 4zm.002 6a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-patch-minus" fill="currentColor" id="patch-minus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.5 8a.5.5 0 01.5-.5h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/><path fill-rule="evenodd" d="M10.273 2.513l-.921-.944.715-.698.622.637.89-.011a2.89 2.89 0 012.924 2.924l-.01.89.636.622a2.89 2.89 0 010 4.134l-.637.622.011.89a2.89 2.89 0 01-2.924 2.924l-.89-.01-.622.636a2.89 2.89 0 01-4.134 0l-.622-.637-.89.011a2.89 2.89 0 01-2.924-2.924l.01-.89-.636-.622a2.89 2.89 0 010-4.134l.637-.622-.011-.89a2.89 2.89 0 012.924-2.924l.89.01.622-.636a2.89 2.89 0 014.134 0l-.715.698a1.89 1.89 0 00-2.704 0l-.92.944-1.32-.016a1.89 1.89 0 00-1.911 1.912l.016 1.318-.944.921a1.89 1.89 0 000 2.704l.944.92-.016 1.32a1.89 1.89 0 001.912 1.911l1.318-.016.921.944a1.89 1.89 0 002.704 0l.92-.944 1.32.016a1.89 1.89 0 001.911-1.912l-.016-1.318.944-.921a1.89 1.89 0 000-2.704l-.944-.92.016-1.32a1.89 1.89 0 00-1.912-1.911l-1.318.016z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-patch-minus-fll" fill="currentColor" id="patch-minus-fll" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.067.87a2.89 2.89 0 00-4.134 0l-.622.638-.89-.011a2.89 2.89 0 00-2.924 2.924l.01.89-.636.622a2.89 2.89 0 000 4.134l.637.622-.011.89a2.89 2.89 0 002.924 2.924l.89-.01.622.636a2.89 2.89 0 004.134 0l.622-.637.89.011a2.89 2.89 0 002.924-2.924l-.01-.89.636-.622a2.89 2.89 0 000-4.134l-.637-.622.011-.89a2.89 2.89 0 00-2.924-2.924l-.89.01-.622-.636zM6 7.5a.5.5 0 000 1h4a.5.5 0 000-1H6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-patch-plus" fill="currentColor" id="patch-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.273 2.513l-.921-.944.715-.698.622.637.89-.011a2.89 2.89 0 012.924 2.924l-.01.89.636.622a2.89 2.89 0 010 4.134l-.637.622.011.89a2.89 2.89 0 01-2.924 2.924l-.89-.01-.622.636a2.89 2.89 0 01-4.134 0l-.622-.637-.89.011a2.89 2.89 0 01-2.924-2.924l.01-.89-.636-.622a2.89 2.89 0 010-4.134l.637-.622-.011-.89a2.89 2.89 0 012.924-2.924l.89.01.622-.636a2.89 2.89 0 014.134 0l-.715.698a1.89 1.89 0 00-2.704 0l-.92.944-1.32-.016a1.89 1.89 0 00-1.911 1.912l.016 1.318-.944.921a1.89 1.89 0 000 2.704l.944.92-.016 1.32a1.89 1.89 0 001.912 1.911l1.318-.016.921.944a1.89 1.89 0 002.704 0l.92-.944 1.32.016a1.89 1.89 0 001.911-1.912l-.016-1.318.944-.921a1.89 1.89 0 000-2.704l-.944-.92.016-1.32a1.89 1.89 0 00-1.912-1.911l-1.318.016z"/><path fill-rule="evenodd" d="M8 5.5a.5.5 0 01.5.5v2a.5.5 0 01-.5.5H6a.5.5 0 010-1h1.5V6a.5.5 0 01.5-.5z"/><path fill-rule="evenodd" d="M7.5 8a.5.5 0 01.5-.5h2a.5.5 0 010 1H8.5V10a.5.5 0 01-1 0V8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-patch-plus-fll" fill="currentColor" id="patch-plus-fll" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.067.87a2.89 2.89 0 00-4.134 0l-.622.638-.89-.011a2.89 2.89 0 00-2.924 2.924l.01.89-.636.622a2.89 2.89 0 000 4.134l.637.622-.011.89a2.89 2.89 0 002.924 2.924l.89-.01.622.636a2.89 2.89 0 004.134 0l.622-.637.89.011a2.89 2.89 0 002.924-2.924l-.01-.89.636-.622a2.89 2.89 0 000-4.134l-.637-.622.011-.89a2.89 2.89 0 00-2.924-2.924l-.89.01-.622-.636zM8.5 6a.5.5 0 00-1 0v1.5H6a.5.5 0 000 1h1.5V10a.5.5 0 001 0V8.5H10a.5.5 0 000-1H8.5V6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-patch-question" fill="currentColor" id="patch-question" xmlns="http://www.w3.org/2000/svg"><path d="M7.002 11a1 1 0 112 0 1 1 0 01-2 0zM8.05 9.6c.336 0 .504-.24.554-.627.04-.534.198-.815.847-1.26.673-.475 1.049-1.09 1.049-1.986 0-1.325-.92-2.227-2.262-2.227-1.02 0-1.792.492-2.1 1.29A1.71 1.71 0 006 5.48c0 .393.203.64.545.64.272 0 .455-.147.564-.51.158-.592.525-.915 1.074-.915.61 0 1.03.446 1.03 1.084 0 .563-.208.885-.822 1.325-.619.433-.926.914-.926 1.64v.111c0 .428.208.745.585.745z"/><path fill-rule="evenodd" d="M10.273 2.513l-.921-.944.715-.698.622.637.89-.011a2.89 2.89 0 012.924 2.924l-.01.89.636.622a2.89 2.89 0 010 4.134l-.637.622.011.89a2.89 2.89 0 01-2.924 2.924l-.89-.01-.622.636a2.89 2.89 0 01-4.134 0l-.622-.637-.89.011a2.89 2.89 0 01-2.924-2.924l.01-.89-.636-.622a2.89 2.89 0 010-4.134l.637-.622-.011-.89a2.89 2.89 0 012.924-2.924l.89.01.622-.636a2.89 2.89 0 014.134 0l-.715.698a1.89 1.89 0 00-2.704 0l-.92.944-1.32-.016a1.89 1.89 0 00-1.911 1.912l.016 1.318-.944.921a1.89 1.89 0 000 2.704l.944.92-.016 1.32a1.89 1.89 0 001.912 1.911l1.318-.016.921.944a1.89 1.89 0 002.704 0l.92-.944 1.32.016a1.89 1.89 0 001.911-1.912l-.016-1.318.944-.921a1.89 1.89 0 000-2.704l-.944-.92.016-1.32a1.89 1.89 0 00-1.912-1.911l-1.318.016z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-patch-question-fll" fill="currentColor" id="patch-question-fll" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.933.87a2.89 2.89 0 014.134 0l.622.638.89-.011a2.89 2.89 0 012.924 2.924l-.01.89.636.622a2.89 2.89 0 010 4.134l-.637.622.011.89a2.89 2.89 0 01-2.924 2.924l-.89-.01-.622.636a2.89 2.89 0 01-4.134 0l-.622-.637-.89.011a2.89 2.89 0 01-2.924-2.924l.01-.89-.636-.622a2.89 2.89 0 010-4.134l.637-.622-.011-.89a2.89 2.89 0 012.924-2.924l.89.01.622-.636zM7.002 11a1 1 0 112 0 1 1 0 01-2 0zm1.602-2.027c-.05.386-.218.627-.554.627-.377 0-.585-.317-.585-.745v-.11c0-.727.307-1.208.926-1.641.614-.44.822-.762.822-1.325 0-.638-.42-1.084-1.03-1.084-.55 0-.916.323-1.074.914-.109.364-.292.51-.564.51C6.203 6.12 6 5.873 6 5.48c0-.251.045-.468.139-.69.307-.798 1.079-1.29 2.099-1.29 1.341 0 2.262.902 2.262 2.227 0 .896-.376 1.511-1.05 1.986-.648.445-.806.726-.846 1.26z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pause" fill="currentColor" id="pause" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 3.5a.5.5 0 01.5.5v8a.5.5 0 01-1 0V4a.5.5 0 01.5-.5zm4 0a.5.5 0 01.5.5v8a.5.5 0 01-1 0V4a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pause-fill" fill="currentColor" id="pause-fill" xmlns="http://www.w3.org/2000/svg"><path d="M5.5 3.5A1.5 1.5 0 017 5v6a1.5 1.5 0 01-3 0V5a1.5 1.5 0 011.5-1.5zm5 0A1.5 1.5 0 0112 5v6a1.5 1.5 0 01-3 0V5a1.5 1.5 0 011.5-1.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-peace" fill="currentColor" id="peace" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.5 1.018a7 7 0 00-4.79 11.566L7.5 7.793V1.018zm1 0v6.775l4.79 4.79A7 7 0 008.5 1.018zm4.084 12.273L8.5 9.207v5.775a6.97 6.97 0 004.084-1.691zM7.5 14.982V9.207l-4.084 4.084A6.97 6.97 0 007.5 14.982zM0 8a8 8 0 1116 0A8 8 0 010 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-peace-fill" fill="currentColor" id="peace-fill" xmlns="http://www.w3.org/2000/svg"><path d="M14 13.292A8 8 0 008.5.015v7.778l5.5 5.5zm-.708.708L8.5 9.206v6.778a7.967 7.967 0 004.792-1.986zM7.5 15.985V9.207L2.708 14A7.967 7.967 0 007.5 15.985zM2 13.292A8 8 0 017.5.015v7.778l-5.5 5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pen" fill="currentColor" id="pen" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13.498.795l.149-.149a1.207 1.207 0 111.707 1.708l-.149.148a1.5 1.5 0 01-.059 2.059L4.854 14.854a.5.5 0 01-.233.131l-4 1a.5.5 0 01-.606-.606l1-4a.5.5 0 01.131-.232l9.642-9.642a.5.5 0 00-.642.056L6.854 4.854a.5.5 0 11-.708-.708L9.44.854A1.5 1.5 0 0111.5.796a1.5 1.5 0 011.998-.001zm-.644.766a.5.5 0 00-.707 0L1.95 11.756l-.764 3.057 3.057-.764L14.44 3.854a.5.5 0 000-.708l-1.585-1.585z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pen-fill" fill="currentColor" id="pen-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13.498.795l.149-.149a1.207 1.207 0 111.707 1.708l-.149.148a1.5 1.5 0 01-.059 2.059L4.854 14.854a.5.5 0 01-.233.131l-4 1a.5.5 0 01-.606-.606l1-4a.5.5 0 01.131-.232l9.642-9.642a.5.5 0 00-.642.056L6.854 4.854a.5.5 0 11-.708-.708L9.44.854A1.5 1.5 0 0111.5.796a1.5 1.5 0 011.998-.001z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pencil" fill="currentColor" id="pencil" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12.146.146a.5.5 0 01.708 0l3 3a.5.5 0 010 .708l-10 10a.5.5 0 01-.168.11l-5 2a.5.5 0 01-.65-.65l2-5a.5.5 0 01.11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 01.5.5v.5h.5a.5.5 0 01.5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 015 12.5V12h-.5a.5.5 0 01-.5-.5V11h-.5a.5.5 0 01-.468-.325z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pencil-fill" fill="currentColor" id="pencil-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12.854.146a.5.5 0 00-.707 0L10.5 1.793 14.207 5.5l1.647-1.646a.5.5 0 000-.708l-3-3zm.646 6.061L9.793 2.5 3.293 9H3.5a.5.5 0 01.5.5v.5h.5a.5.5 0 01.5.5v.5h.5a.5.5 0 01.5.5v.5h.5a.5.5 0 01.5.5v.207l6.5-6.5zm-7.468 7.468A.5.5 0 016 13.5V13h-.5a.5.5 0 01-.5-.5V12h-.5a.5.5 0 01-.5-.5V11h-.5a.5.5 0 01-.5-.5V10h-.5a.499.499 0 01-.175-.032l-.179.178a.5.5 0 00-.11.168l-2 5a.5.5 0 00.65.65l5-2a.5.5 0 00.168-.11l.178-.178z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pencil-square" fill="currentColor" id="pencil-square" xmlns="http://www.w3.org/2000/svg"><path d="M15.502 1.94a.5.5 0 010 .706L14.459 3.69l-2-2L13.502.646a.5.5 0 01.707 0l1.293 1.293zm-1.75 2.456l-2-2L4.939 9.21a.5.5 0 00-.121.196l-.805 2.414a.25.25 0 00.316.316l2.414-.805a.5.5 0 00.196-.12l6.813-6.814z"/><path fill-rule="evenodd" d="M1 13.5A1.5 1.5 0 002.5 15h11a1.5 1.5 0 001.5-1.5v-6a.5.5 0 00-1 0v6a.5.5 0 01-.5.5h-11a.5.5 0 01-.5-.5v-11a.5.5 0 01.5-.5H9a.5.5 0 000-1H2.5A1.5 1.5 0 001 2.5v11z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pentagon" fill="currentColor" id="pentagon" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1.288l-6.842 5.56L3.733 15h8.534l2.575-8.153L8 1.288zM16 6.5L8 0 0 6.5 3 16h10l3-9.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pentagon-fill" fill="currentColor" id="pentagon-fill" xmlns="http://www.w3.org/2000/svg"><path d="M8 0l8 6.5-3 9.5H3L0 6.5 8 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pentagon-half" fill="currentColor" id="pentagon-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1.288V15h4.267l2.575-8.153L8 1.288zM16 6.5L8 0 0 6.5 3 16h10l3-9.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-people" fill="currentColor" id="people" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15 14s1 0 1-1-1-4-5-4-5 3-5 4 1 1 1 1h8zm-7.978-1h7.956a.274.274 0 00.014-.002l.008-.002c-.002-.264-.167-1.03-.76-1.72C13.688 10.629 12.718 10 11 10c-1.717 0-2.687.63-3.24 1.276-.593.69-.759 1.457-.76 1.72a1.05 1.05 0 00.022.004zM11 7a2 2 0 100-4 2 2 0 000 4zm3-2a3 3 0 11-6 0 3 3 0 016 0zM6.936 9.28a5.88 5.88 0 00-1.23-.247A7.35 7.35 0 005 9c-4 0-5 3-5 4 0 .667.333 1 1 1h4.216A2.238 2.238 0 015 13c0-1.01.377-2.042 1.09-2.904.243-.294.526-.569.846-.816zM4.92 10c-1.668.02-2.615.64-3.16 1.276C1.163 11.97 1 12.739 1 13h3c0-1.045.323-2.086.92-3zM1.5 5.5a3 3 0 116 0 3 3 0 01-6 0zm3-2a2 2 0 100 4 2 2 0 000-4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-people-fill" fill="currentColor" id="people-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7 14s-1 0-1-1 1-4 5-4 5 3 5 4-1 1-1 1H7zm4-6a3 3 0 100-6 3 3 0 000 6zm-5.784 6A2.238 2.238 0 015 13c0-1.355.68-2.75 1.936-3.72A6.325 6.325 0 005 9c-4 0-5 3-5 4s1 1 1 1h4.216zM4.5 8a2.5 2.5 0 100-5 2.5 2.5 0 000 5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-percent" fill="currentColor" id="percent" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13.442 2.558a.625.625 0 010 .884l-10 10a.625.625 0 11-.884-.884l10-10a.625.625 0 01.884 0zM4.5 6a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm0 1a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm7 6a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm0 1a2.5 2.5 0 100-5 2.5 2.5 0 000 5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person" fill="currentColor" id="person" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 5a2 2 0 11-4 0 2 2 0 014 0zM8 8a3 3 0 100-6 3 3 0 000 6zm6 5c0 1-1 1-1 1H3s-1 0-1-1 1-4 6-4 6 3 6 4zm-1-.004c-.001-.246-.154-.986-.832-1.664C11.516 10.68 10.289 10 8 10c-2.29 0-3.516.68-4.168 1.332-.678.678-.83 1.418-.832 1.664h10z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-badge" fill="currentColor" id="person-badge" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2.5A2.5 2.5 0 014.5 0h7A2.5 2.5 0 0114 2.5V14a2 2 0 01-2 2H4a2 2 0 01-2-2V2.5zM4.5 1A1.5 1.5 0 003 2.5v10.795a4.2 4.2 0 01.776-.492C4.608 12.387 5.937 12 8 12s3.392.387 4.224.803a4.2 4.2 0 01.776.492V2.5A1.5 1.5 0 0011.5 1h-7z"/><path fill-rule="evenodd" d="M8 11a3 3 0 100-6 3 3 0 000 6zM6 2.5a.5.5 0 01.5-.5h3a.5.5 0 010 1h-3a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-badge-fill" fill="currentColor" id="person-badge-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm4.5 0a.5.5 0 000 1h3a.5.5 0 000-1h-3zM8 11a3 3 0 100-6 3 3 0 000 6zm5 2.755C12.146 12.825 10.623 12 8 12s-4.146.826-5 1.755V14a1 1 0 001 1h8a1 1 0 001-1v-.245z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-bounding-box" fill="currentColor" id="person-bounding-box" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 1a.5.5 0 00-.5.5v3a.5.5 0 01-1 0v-3A1.5 1.5 0 011.5 0h3a.5.5 0 010 1h-3zM11 .5a.5.5 0 01.5-.5h3A1.5 1.5 0 0116 1.5v3a.5.5 0 01-1 0v-3a.5.5 0 00-.5-.5h-3a.5.5 0 01-.5-.5zM.5 11a.5.5 0 01.5.5v3a.5.5 0 00.5.5h3a.5.5 0 010 1h-3A1.5 1.5 0 010 14.5v-3a.5.5 0 01.5-.5zm15 0a.5.5 0 01.5.5v3a1.5 1.5 0 01-1.5 1.5h-3a.5.5 0 010-1h3a.5.5 0 00.5-.5v-3a.5.5 0 01.5-.5z"/><path fill-rule="evenodd" d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3zm5-6a3 3 0 100-6 3 3 0 000 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-check" fill="currentColor" id="person-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 5a2 2 0 11-4 0 2 2 0 014 0zM6 8a3 3 0 100-6 3 3 0 000 6zm6 5c0 1-1 1-1 1H1s-1 0-1-1 1-4 6-4 6 3 6 4zm-1-.004c-.001-.246-.154-.986-.832-1.664C9.516 10.68 8.289 10 6 10c-2.29 0-3.516.68-4.168 1.332-.678.678-.83 1.418-.832 1.664h10zm4.854-7.85a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 01.708-.708L12.5 7.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-check-fill" fill="currentColor" id="person-check-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H1zm5-6a3 3 0 100-6 3 3 0 000 6zm9.854-2.854a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 01.708-.708L12.5 7.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-circle" fill="currentColor" id="person-circle" xmlns="http://www.w3.org/2000/svg"><path d="M13.468 12.37C12.758 11.226 11.195 10 8 10s-4.757 1.225-5.468 2.37A6.987 6.987 0 008 15a6.987 6.987 0 005.468-2.63z"/><path fill-rule="evenodd" d="M8 9a3 3 0 100-6 3 3 0 000 6z"/><path fill-rule="evenodd" d="M8 1a7 7 0 100 14A7 7 0 008 1zM0 8a8 8 0 1116 0A8 8 0 010 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-dash" fill="currentColor" id="person-dash" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 5a2 2 0 11-4 0 2 2 0 014 0zM6 8a3 3 0 100-6 3 3 0 000 6zm6 5c0 1-1 1-1 1H1s-1 0-1-1 1-4 6-4 6 3 6 4zm-1-.004c-.001-.246-.154-.986-.832-1.664C9.516 10.68 8.289 10 6 10c-2.29 0-3.516.68-4.168 1.332-.678.678-.83 1.418-.832 1.664h10zM11 7.5a.5.5 0 01.5-.5h4a.5.5 0 010 1h-4a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-dash-fill" fill="currentColor" id="person-dash-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H1zm5-6a3 3 0 100-6 3 3 0 000 6zm5-.5a.5.5 0 01.5-.5h4a.5.5 0 010 1h-4a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-fill" fill="currentColor" id="person-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3zm5-6a3 3 0 100-6 3 3 0 000 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-lines-fill" fill="currentColor" id="person-lines-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H1zm5-6a3 3 0 100-6 3 3 0 000 6zm7 1.5a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5zm-2-3a.5.5 0 01.5-.5h4a.5.5 0 010 1h-4a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h4a.5.5 0 010 1h-4a.5.5 0 01-.5-.5zm2 9a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-plus" fill="currentColor" id="person-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 5a2 2 0 11-4 0 2 2 0 014 0zM6 8a3 3 0 100-6 3 3 0 000 6zm6 5c0 1-1 1-1 1H1s-1 0-1-1 1-4 6-4 6 3 6 4zm-1-.004c-.001-.246-.154-.986-.832-1.664C9.516 10.68 8.289 10 6 10c-2.29 0-3.516.68-4.168 1.332-.678.678-.83 1.418-.832 1.664h10zM13.5 5a.5.5 0 01.5.5V7h1.5a.5.5 0 010 1H14v1.5a.5.5 0 01-1 0V8h-1.5a.5.5 0 010-1H13V5.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-plus-fill" fill="currentColor" id="person-plus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H1zm5-6a3 3 0 100-6 3 3 0 000 6zm7.5-3a.5.5 0 01.5.5V7h1.5a.5.5 0 010 1H14v1.5a.5.5 0 01-1 0V8h-1.5a.5.5 0 010-1H13V5.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-square" fill="currentColor" id="person-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M2 15v-1c0-1 1-4 6-4s6 3 6 4v1H2zm6-6a3 3 0 100-6 3 3 0 000 6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-x" fill="currentColor" id="person-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 5a2 2 0 11-4 0 2 2 0 014 0zM6 8a3 3 0 100-6 3 3 0 000 6zm6 5c0 1-1 1-1 1H1s-1 0-1-1 1-4 6-4 6 3 6 4zm-1-.004c-.001-.246-.154-.986-.832-1.664C9.516 10.68 8.289 10 6 10c-2.29 0-3.516.68-4.168 1.332-.678.678-.83 1.418-.832 1.664h10zm1.146-7.85a.5.5 0 01.708 0L14 6.293l1.146-1.147a.5.5 0 01.708.708L14.707 7l1.147 1.146a.5.5 0 01-.708.708L14 7.707l-1.146 1.147a.5.5 0 01-.708-.708L13.293 7l-1.147-1.146a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-person-x-fill" fill="currentColor" id="person-x-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H1zm5-6a3 3 0 100-6 3 3 0 000 6zm6.146-2.854a.5.5 0 01.708 0L14 6.293l1.146-1.147a.5.5 0 01.708.708L14.707 7l1.147 1.146a.5.5 0 01-.708.708L14 7.707l-1.146 1.147a.5.5 0 01-.708-.708L13.293 7l-1.147-1.146a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-phone" fill="currentColor" id="phone" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11 1H5a1 1 0 00-1 1v12a1 1 0 001 1h6a1 1 0 001-1V2a1 1 0 00-1-1zM5 0a2 2 0 00-2 2v12a2 2 0 002 2h6a2 2 0 002-2V2a2 2 0 00-2-2H5z"/><path fill-rule="evenodd" d="M8 14a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-phone-fill" fill="currentColor" id="phone-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 2a2 2 0 012-2h6a2 2 0 012 2v12a2 2 0 01-2 2H5a2 2 0 01-2-2V2zm6 11a1 1 0 11-2 0 1 1 0 012 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-phone-landscape" fill="currentColor" id="phone-landscape" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 4.5v6a1 1 0 001 1h12a1 1 0 001-1v-6a1 1 0 00-1-1H2a1 1 0 00-1 1zm-1 6a2 2 0 002 2h12a2 2 0 002-2v-6a2 2 0 00-2-2H2a2 2 0 00-2 2v6z"/><path fill-rule="evenodd" d="M14 7.5a1 1 0 10-2 0 1 1 0 002 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-phone-landscape-fill" fill="currentColor" id="phone-landscape-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 12.5a2 2 0 01-2-2v-6a2 2 0 012-2h12a2 2 0 012 2v6a2 2 0 01-2 2H2zm11-6a1 1 0 110 2 1 1 0 010-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-phone-vibrate" fill="currentColor" id="phone-vibrate" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10 3H6a1 1 0 00-1 1v8a1 1 0 001 1h4a1 1 0 001-1V4a1 1 0 00-1-1zM6 2a2 2 0 00-2 2v8a2 2 0 002 2h4a2 2 0 002-2V4a2 2 0 00-2-2H6z"/><path fill-rule="evenodd" d="M8 12a1 1 0 100-2 1 1 0 000 2zM1.599 4.058a.5.5 0 01.208.676A6.967 6.967 0 001 8c0 1.18.292 2.292.807 3.266a.5.5 0 01-.884.468A7.968 7.968 0 010 8c0-1.347.334-2.619.923-3.734a.5.5 0 01.676-.208zm12.802 0a.5.5 0 01.676.208A7.967 7.967 0 0116 8a7.967 7.967 0 01-.923 3.734.5.5 0 01-.884-.468A6.967 6.967 0 0015 8c0-1.18-.292-2.292-.807-3.266a.5.5 0 01.208-.676zM3.057 5.534a.5.5 0 01.284.648A4.986 4.986 0 003 8c0 .642.12 1.255.34 1.818a.5.5 0 11-.93.364A5.986 5.986 0 012 8c0-.769.145-1.505.41-2.182a.5.5 0 01.647-.284zm9.886 0a.5.5 0 01.648.284C13.855 6.495 14 7.231 14 8c0 .769-.145 1.505-.41 2.182a.5.5 0 01-.93-.364C12.88 9.255 13 8.642 13 8c0-.642-.12-1.255-.34-1.818a.5.5 0 01.283-.648z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pie-chart" fill="currentColor" id="pie-chart" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M7.5 7.793V1h1v6.5H15v1H8.207l-4.853 4.854-.708-.708L7.5 7.793z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pie-chart-fill" fill="currentColor" id="pie-chart-fill" xmlns="http://www.w3.org/2000/svg"><path d="M15.985 8.5H8.207l-5.5 5.5a8 8 0 0013.277-5.5zM2 13.292A8 8 0 017.5.015v7.778l-5.5 5.5zM8.5.015V7.5h7.485A8.001 8.001 0 008.5.015z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pip" fill="currentColor" id="pip" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 3.5A1.5 1.5 0 011.5 2h13A1.5 1.5 0 0116 3.5v9a1.5 1.5 0 01-1.5 1.5h-13A1.5 1.5 0 010 12.5v-9zM1.5 3a.5.5 0 00-.5.5v9a.5.5 0 00.5.5h13a.5.5 0 00.5-.5v-9a.5.5 0 00-.5-.5h-13z"/><path d="M8 8.5a.5.5 0 01.5-.5h5a.5.5 0 01.5.5v3a.5.5 0 01-.5.5h-5a.5.5 0 01-.5-.5v-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-pip-fill" fill="currentColor" id="pip-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 2A1.5 1.5 0 000 3.5v9A1.5 1.5 0 001.5 14h13a1.5 1.5 0 001.5-1.5v-9A1.5 1.5 0 0014.5 2h-13zm7 6a.5.5 0 00-.5.5v3a.5.5 0 00.5.5h5a.5.5 0 00.5-.5v-3a.5.5 0 00-.5-.5h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-play" fill="currentColor" id="play" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.804 8L5 4.633v6.734L10.804 8zm.792-.696a.802.802 0 010 1.392l-6.363 3.692C4.713 12.69 4 12.345 4 11.692V4.308c0-.653.713-.998 1.233-.696l6.363 3.692z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-play-fill" fill="currentColor" id="play-fill" xmlns="http://www.w3.org/2000/svg"><path d="M11.596 8.697l-6.363 3.692c-.54.313-1.233-.066-1.233-.697V4.308c0-.63.692-1.01 1.233-.696l6.363 3.692a.802.802 0 010 1.393z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-plug" fill="currentColor" id="plug" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 0a.5.5 0 01.5.5V3h3V.5a.5.5 0 011 0V3h1a.5.5 0 01.5.5v3A3.5 3.5 0 018.5 10c-.002.434-.01.845-.04 1.22-.041.514-.126 1.003-.317 1.424a2.083 2.083 0 01-.97 1.028C6.725 13.9 6.169 14 5.5 14c-.998 0-1.61.33-1.974.718A1.922 1.922 0 003 16H2c0-.616.232-1.367.797-1.968C3.374 13.42 4.261 13 5.5 13c.581 0 .962-.088 1.218-.219.241-.123.4-.3.514-.55.121-.266.193-.621.23-1.09.027-.34.035-.718.037-1.141A3.5 3.5 0 014 6.5v-3a.5.5 0 01.5-.5h1V.5A.5.5 0 016 0zM5 4v2.5A2.5 2.5 0 007.5 9h1A2.5 2.5 0 0011 6.5V4H5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-plug-fill" fill="currentColor" id="plug-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 0a.5.5 0 01.5.5V3h3V.5a.5.5 0 011 0V3h1a.5.5 0 01.5.5v3A3.5 3.5 0 018.5 10c-.002.434-.01.845-.04 1.22-.041.514-.126 1.003-.317 1.424a2.083 2.083 0 01-.97 1.028C6.725 13.9 6.169 14 5.5 14c-.998 0-1.61.33-1.974.718A1.922 1.922 0 003 16H2c0-.616.232-1.367.797-1.968C3.374 13.42 4.261 13 5.5 13c.581 0 .962-.088 1.218-.219.241-.123.4-.3.514-.55.121-.266.193-.621.23-1.09.027-.34.035-.718.037-1.141A3.5 3.5 0 014 6.5v-3a.5.5 0 01.5-.5h1V.5A.5.5 0 016 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-plus" fill="currentColor" id="plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 4a.5.5 0 01.5.5v3h3a.5.5 0 010 1h-3v3a.5.5 0 01-1 0v-3h-3a.5.5 0 010-1h3v-3A.5.5 0 018 4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-plus-circle" fill="currentColor" id="plus-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M8 4a.5.5 0 01.5.5v3h3a.5.5 0 010 1h-3v3a.5.5 0 01-1 0v-3h-3a.5.5 0 010-1h3v-3A.5.5 0 018 4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-plus-circle-fill" fill="currentColor" id="plus-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zM8.5 4.5a.5.5 0 00-1 0v3h-3a.5.5 0 000 1h3v3a.5.5 0 001 0v-3h3a.5.5 0 000-1h-3v-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-plus-square" fill="currentColor" id="plus-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M8 4a.5.5 0 01.5.5v3h3a.5.5 0 010 1h-3v3a.5.5 0 01-1 0v-3h-3a.5.5 0 010-1h3v-3A.5.5 0 018 4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-plus-square-fill" fill="currentColor" id="plus-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm6.5 4.5a.5.5 0 00-1 0v3h-3a.5.5 0 000 1h3v3a.5.5 0 001 0v-3h3a.5.5 0 000-1h-3v-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-power" fill="currentColor" id="power" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.578 4.437a5 5 0 104.922.044l.5-.866a6 6 0 11-5.908-.053l.486.875z"/><path fill-rule="evenodd" d="M7.5 8V1h1v7h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-printer" fill="currentColor" id="printer" xmlns="http://www.w3.org/2000/svg"><path d="M11 2H5a1 1 0 00-1 1v2H3V3a2 2 0 012-2h6a2 2 0 012 2v2h-1V3a1 1 0 00-1-1zm3 4H2a1 1 0 00-1 1v3a1 1 0 001 1h1v1H2a2 2 0 01-2-2V7a2 2 0 012-2h12a2 2 0 012 2v3a2 2 0 01-2 2h-1v-1h1a1 1 0 001-1V7a1 1 0 00-1-1z"/><path fill-rule="evenodd" d="M11 9H5a1 1 0 00-1 1v3a1 1 0 001 1h6a1 1 0 001-1v-3a1 1 0 00-1-1zM5 8a2 2 0 00-2 2v3a2 2 0 002 2h6a2 2 0 002-2v-3a2 2 0 00-2-2H5z"/><path d="M3 7.5a.5.5 0 11-1 0 .5.5 0 011 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-printer-fill" fill="currentColor" id="printer-fill" xmlns="http://www.w3.org/2000/svg"><path d="M5 1a2 2 0 00-2 2v1h10V3a2 2 0 00-2-2H5z"/><path fill-rule="evenodd" d="M11 9H5a1 1 0 00-1 1v3a1 1 0 001 1h6a1 1 0 001-1v-3a1 1 0 00-1-1z"/><path fill-rule="evenodd" d="M0 7a2 2 0 012-2h12a2 2 0 012 2v3a2 2 0 01-2 2h-1v-2a2 2 0 00-2-2H5a2 2 0 00-2 2v2H2a2 2 0 01-2-2V7zm2.5 1a.5.5 0 100-1 .5.5 0 000 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-puzzle" fill="currentColor" id="puzzle" xmlns="http://www.w3.org/2000/svg"><path d="M4.605 2.5V2v.5zM3.61 3.6l.498-.043V3.55l-.498.05zM7 2.5h.5A.5.5 0 007 2v.5zm-.676 1.454l.304.397-.304-.397zm3.352 0l-.304.397.304-.397zM9 2.5V2a.5.5 0 00-.5.5H9zm3.39 1.1l-.498-.05v.007l.498.043zM12.1 7l-.498-.043a.5.5 0 00.498.543V7zm1.854-.676l.397.304-.397-.304zm0 3.352l.397-.304-.397.304zM12.1 9v-.5a.5.5 0 00-.498.542L12.1 9zm.29 3.4l-.498.043v.007l.498-.05zM9 13.5h-.5a.5.5 0 00.5.5v-.5zm.676-1.454l-.304-.397.304.397zm-3.352 0l.304-.397-.304.397zM7 13.5v.5a.5.5 0 00.5-.5H7zm-2.395 0V13v.5zm-.995-1.1l.498.05v-.007L3.61 12.4zM3.9 9l.498.042A.5.5 0 003.9 8.5V9zm-1.854.676l-.397-.304.397.304zm0-3.352l-.397.304.397-.304zM3.9 7v.5a.5.5 0 00.498-.543L3.9 7zm.705-5a1.5 1.5 0 00-1.493 1.65l.995-.1A.5.5 0 014.605 3V2zM7 2H4.605v1H7V2zm.5.882V2.5h-1v.382h1zm-.872 1.469c.375-.287.872-.773.872-1.469h-1c0 .195-.147.42-.48.675l.608.794zM6.5 4.5l.001-.006a.113.113 0 01.012-.025.459.459 0 01.115-.118l-.608-.794c-.274.21-.52.528-.52.943h1zM8 5c-.491 0-.912-.1-1.19-.24a.86.86 0 01-.271-.194.213.213 0 01-.039-.063V4.5h-1c0 .568.447.947.862 1.154C6.807 5.877 7.387 6 8 6V5zm1.5-.5v.003a.213.213 0 01-.039.064.86.86 0 01-.27.193C8.91 4.9 8.49 5 8 5v1c.613 0 1.193-.123 1.638-.346.415-.207.862-.586.862-1.154h-1zm-.128-.15c.065.05.099.092.115.119.008.013.01.021.012.025L9.5 4.5h1c0-.415-.246-.733-.52-.943l-.608.794zM8.5 2.883c0 .696.497 1.182.872 1.469l.608-.794c-.333-.255-.48-.48-.48-.675h-1zm0-.382v.382h1V2.5h-1zm2.895-.5H9v1h2.395V2zm1.493 1.65A1.5 1.5 0 0011.395 2v1a.5.5 0 01.498.55l.995.1zm-.29 3.392l.29-3.4-.996-.085-.29 3.4.996.085zm.284-.542H12.1v1h.782v-1zm.675-.48c-.255.333-.48.48-.675.48v1c.696 0 1.182-.497 1.469-.872l-.794-.608zm.943-.52c-.415 0-.733.246-.943.52l.794.608a.459.459 0 01.118-.115.113.113 0 01.025-.012L14.5 6.5v-1zM16 8c0-.613-.123-1.193-.346-1.638-.207-.415-.586-.862-1.154-.862v1h.003l.01.003a.237.237 0 01.053.036.86.86 0 01.194.27c.14.28.24.7.24 1.191h1zm-1.5 2.5c.568 0 .947-.447 1.154-.862C15.877 9.193 16 8.613 16 8h-1c0 .491-.1.912-.24 1.19a.86.86 0 01-.194.271.214.214 0 01-.063.039H14.5v1zm-.943-.52c.21.274.528.52.943.52v-1l-.006-.001a.113.113 0 01-.025-.012.458.458 0 01-.118-.115l-.794.608zm-.675-.48c.195 0 .42.147.675.48l.794-.608c-.287-.375-.773-.872-1.469-.872v1zm-.782 0h.782v-1H12.1v1zm.788 2.858l-.29-3.4-.996.084.29 3.401.996-.085zM11.395 14a1.5 1.5 0 001.493-1.65l-.995.1a.5.5 0 01-.498.55v1zM9 14h2.395v-1H9v1zm.5-.5v-.382h-1v.382h1zm0-.382c0-.195.147-.42.48-.675l-.608-.794c-.375.287-.872.773-.872 1.469h1zm.48-.675c.274-.21.52-.528.52-.943h-1l-.001.006a.113.113 0 01-.012.025.459.459 0 01-.115.118l.608.794zm.52-.943c0-.568-.447-.947-.862-1.154C9.193 10.123 8.613 10 8 10v1c.492 0 .912.1 1.19.24.14.07.226.14.271.194a.214.214 0 01.039.063v.003h1zM8 10c-.613 0-1.193.123-1.638.346-.415.207-.862.586-.862 1.154h1v-.003l.003-.01a.214.214 0 01.036-.053.859.859 0 01.27-.194C7.09 11.1 7.51 11 8 11v-1zm-2.5 1.5c0 .415.246.733.52.943l.608-.794a.459.459 0 01-.115-.118.113.113 0 01-.012-.025L6.5 11.5h-1zm.52.943c.333.255.48.48.48.675h1c0-.696-.497-1.182-.872-1.469l-.608.794zm.48.675v.382h1v-.382h-1zM4.605 14H7v-1H4.605v1zm-1.493-1.65A1.5 1.5 0 004.605 14v-1a.5.5 0 01-.498-.55l-.995-.1zm.29-3.393l-.29 3.401.996.085.29-3.4-.996-.086zm-.284.543H3.9v-1h-.782v1zm-.675.48c.255-.333.48-.48.675-.48v-1c-.696 0-1.182.497-1.469.872l.794.608zm-.943.52c.415 0 .733-.246.943-.52l-.794-.608a.459.459 0 01-.118.115.112.112 0 01-.025.012L1.5 9.5v1zM0 8c0 .613.123 1.193.346 1.638.207.415.586.862 1.154.862v-1h-.003a.213.213 0 01-.064-.039.86.86 0 01-.193-.27C1.1 8.91 1 8.49 1 8H0zm1.5-2.5c-.568 0-.947.447-1.154.862C.123 6.807 0 7.387 0 8h1c0-.492.1-.912.24-1.19a.86.86 0 01.194-.271.213.213 0 01.063-.039H1.5v-1zm.943.52c-.21-.274-.528-.52-.943-.52v1l.006.001a.112.112 0 01.025.012c.027.016.068.05.118.115l.794-.608zm.675.48c-.195 0-.42-.147-.675-.48l-.794.608c.287.375.773.872 1.469.872v-1zm.782 0h-.782v1H3.9v-1zm-.788-2.858l.29 3.4.996-.085-.29-3.4-.996.085z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-puzzle-fill" fill="currentColor" id="puzzle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.112 3.645A1.5 1.5 0 014.605 2H7a.5.5 0 01.5.5v.382c0 .696-.497 1.182-.872 1.469a.459.459 0 00-.115.118.113.113 0 00-.012.025L6.5 4.5v.003l.003.01c.004.01.014.028.036.053a.86.86 0 00.27.194C7.09 4.9 7.51 5 8 5c.492 0 .912-.1 1.19-.24a.86.86 0 00.271-.194.213.213 0 00.036-.054l.003-.01v-.008a.112.112 0 00-.012-.025.459.459 0 00-.115-.118c-.375-.287-.872-.773-.872-1.469V2.5A.5.5 0 019 2h2.395a1.5 1.5 0 011.493 1.645L12.645 6.5h.237c.195 0 .42-.147.675-.48.21-.274.528-.52.943-.52.568 0 .947.447 1.154.862C15.877 6.807 16 7.387 16 8s-.123 1.193-.346 1.638c-.207.415-.586.862-1.154.862-.415 0-.733-.246-.943-.52-.255-.333-.48-.48-.675-.48h-.237l.243 2.855A1.5 1.5 0 0111.395 14H9a.5.5 0 01-.5-.5v-.382c0-.696.497-1.182.872-1.469a.459.459 0 00.115-.118.113.113 0 00.012-.025L9.5 11.5v-.003l-.003-.01a.214.214 0 00-.036-.053.859.859 0 00-.27-.194C8.91 11.1 8.49 11 8 11c-.491 0-.912.1-1.19.24a.859.859 0 00-.271.194.214.214 0 00-.036.054l-.003.01v.002l.001.006a.113.113 0 00.012.025c.016.027.05.068.115.118.375.287.872.773.872 1.469v.382a.5.5 0 01-.5.5H4.605a1.5 1.5 0 01-1.493-1.645L3.356 9.5h-.238c-.195 0-.42.147-.675.48-.21.274-.528.52-.943.52-.568 0-.947-.447-1.154-.862C.123 9.193 0 8.613 0 8s.123-1.193.346-1.638C.553 5.947.932 5.5 1.5 5.5c.415 0 .733.246.943.52.255.333.48.48.675.48h.238l-.244-2.855z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-question" fill="currentColor" id="question" xmlns="http://www.w3.org/2000/svg"><path d="M5.255 5.786a.237.237 0 00.241.247h.825c.138 0 .248-.113.266-.25.09-.656.54-1.134 1.342-1.134.686 0 1.314.343 1.314 1.168 0 .635-.374.927-.965 1.371-.673.489-1.206 1.06-1.168 1.987l.003.217a.25.25 0 00.25.246h.811a.25.25 0 00.25-.25v-.105c0-.718.273-.927 1.01-1.486.609-.463 1.244-.977 1.244-2.056 0-1.511-1.276-2.241-2.673-2.241-1.267 0-2.655.59-2.75 2.286zm1.557 5.763c0 .533.425.927 1.01.927.609 0 1.028-.394 1.028-.927 0-.552-.42-.94-1.029-.94-.584 0-1.009.388-1.009.94z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-question-circle" fill="currentColor" id="question-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path d="M5.255 5.786a.237.237 0 00.241.247h.825c.138 0 .248-.113.266-.25.09-.656.54-1.134 1.342-1.134.686 0 1.314.343 1.314 1.168 0 .635-.374.927-.965 1.371-.673.489-1.206 1.06-1.168 1.987l.003.217a.25.25 0 00.25.246h.811a.25.25 0 00.25-.25v-.105c0-.718.273-.927 1.01-1.486.609-.463 1.244-.977 1.244-2.056 0-1.511-1.276-2.241-2.673-2.241-1.267 0-2.655.59-2.75 2.286zm1.557 5.763c0 .533.425.927 1.01.927.609 0 1.028-.394 1.028-.927 0-.552-.42-.94-1.029-.94-.584 0-1.009.388-1.009.94z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-question-circle-fill" fill="currentColor" id="question-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zM5.496 6.033a.237.237 0 01-.24-.247C5.35 4.091 6.737 3.5 8.005 3.5c1.396 0 2.672.73 2.672 2.24 0 1.08-.635 1.594-1.244 2.057-.737.559-1.01.768-1.01 1.486v.105a.25.25 0 01-.25.25h-.81a.25.25 0 01-.25-.246l-.004-.217c-.038-.927.495-1.498 1.168-1.987.59-.444.965-.736.965-1.371 0-.825-.628-1.168-1.314-1.168-.803 0-1.253.478-1.342 1.134-.018.137-.128.25-.266.25h-.825zm2.325 6.443c-.584 0-1.009-.394-1.009-.927 0-.552.425-.94 1.01-.94.609 0 1.028.388 1.028.94 0 .533-.42.927-1.029.927z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-question-diamond" fill="currentColor" id="question-diamond" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.95.435c.58-.58 1.52-.58 2.1 0l6.515 6.516c.58.58.58 1.519 0 2.098L9.05 15.565c-.58.58-1.519.58-2.098 0L.435 9.05a1.482 1.482 0 010-2.098L6.95.435zm1.4.7a.495.495 0 00-.7 0L1.134 7.65a.495.495 0 000 .7l6.516 6.516a.495.495 0 00.7 0l6.516-6.516a.495.495 0 000-.7L8.35 1.134z"/><path d="M5.255 5.786a.237.237 0 00.241.247h.825c.138 0 .248-.113.266-.25.09-.656.54-1.134 1.342-1.134.686 0 1.314.343 1.314 1.168 0 .635-.374.927-.965 1.371-.673.489-1.206 1.06-1.168 1.987l.003.217a.25.25 0 00.25.246h.811a.25.25 0 00.25-.25v-.105c0-.718.273-.927 1.01-1.486.609-.463 1.244-.977 1.244-2.056 0-1.511-1.276-2.241-2.673-2.241-1.267 0-2.655.59-2.75 2.286zm1.557 5.763c0 .533.425.927 1.01.927.609 0 1.028-.394 1.028-.927 0-.552-.42-.94-1.029-.94-.584 0-1.009.388-1.009.94z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-question-diamond-fill" fill="currentColor" id="question-diamond-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.05.435c-.58-.58-1.52-.58-2.1 0L.436 6.95c-.58.58-.58 1.519 0 2.098l6.516 6.516c.58.58 1.519.58 2.098 0l6.516-6.516c.58-.58.58-1.519 0-2.098L9.05.435zM5.495 6.033a.237.237 0 01-.24-.247C5.35 4.091 6.737 3.5 8.005 3.5c1.396 0 2.672.73 2.672 2.24 0 1.08-.635 1.594-1.244 2.057-.737.559-1.01.768-1.01 1.486v.105a.25.25 0 01-.25.25h-.81a.25.25 0 01-.25-.246l-.004-.217c-.038-.927.495-1.498 1.168-1.987.59-.444.965-.736.965-1.371 0-.825-.628-1.168-1.314-1.168-.803 0-1.253.478-1.342 1.134-.018.137-.128.25-.266.25h-.825zm2.325 6.443c-.584 0-1.009-.394-1.009-.927 0-.552.425-.94 1.01-.94.609 0 1.028.388 1.028.94 0 .533-.42.927-1.029.927z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-question-octagon" fill="currentColor" id="question-octagon" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.54.146A.5.5 0 014.893 0h6.214a.5.5 0 01.353.146l4.394 4.394a.5.5 0 01.146.353v6.214a.5.5 0 01-.146.353l-4.394 4.394a.5.5 0 01-.353.146H4.893a.5.5 0 01-.353-.146L.146 11.46A.5.5 0 010 11.107V4.893a.5.5 0 01.146-.353L4.54.146zM5.1 1L1 5.1v5.8L5.1 15h5.8l4.1-4.1V5.1L10.9 1H5.1z"/><path d="M5.255 5.786a.237.237 0 00.241.247h.825c.138 0 .248-.113.266-.25.09-.656.54-1.134 1.342-1.134.686 0 1.314.343 1.314 1.168 0 .635-.374.927-.965 1.371-.673.489-1.206 1.06-1.168 1.987l.003.217a.25.25 0 00.25.246h.811a.25.25 0 00.25-.25v-.105c0-.718.273-.927 1.01-1.486.609-.463 1.244-.977 1.244-2.056 0-1.511-1.276-2.241-2.673-2.241-1.267 0-2.655.59-2.75 2.286zm1.557 5.763c0 .533.425.927 1.01.927.609 0 1.028-.394 1.028-.927 0-.552-.42-.94-1.029-.94-.584 0-1.009.388-1.009.94z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-question-octagon-fill" fill="currentColor" id="question-octagon-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.46.146A.5.5 0 0011.107 0H4.893a.5.5 0 00-.353.146L.146 4.54A.5.5 0 000 4.893v6.214a.5.5 0 00.146.353l4.394 4.394a.5.5 0 00.353.146h6.214a.5.5 0 00.353-.146l4.394-4.394a.5.5 0 00.146-.353V4.893a.5.5 0 00-.146-.353L11.46.146zM5.496 6.033a.237.237 0 01-.24-.247C5.35 4.091 6.737 3.5 8.005 3.5c1.396 0 2.672.73 2.672 2.24 0 1.08-.635 1.594-1.244 2.057-.737.559-1.01.768-1.01 1.486v.105a.25.25 0 01-.25.25h-.81a.25.25 0 01-.25-.246l-.004-.217c-.038-.927.495-1.498 1.168-1.987.59-.444.965-.736.965-1.371 0-.825-.628-1.168-1.314-1.168-.803 0-1.253.478-1.342 1.134-.018.137-.128.25-.266.25h-.825zm2.325 6.443c-.584 0-1.009-.394-1.009-.927 0-.552.425-.94 1.01-.94.609 0 1.028.388 1.028.94 0 .533-.42.927-1.029.927z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-question-square" fill="currentColor" id="question-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path d="M5.255 5.786a.237.237 0 00.241.247h.825c.138 0 .248-.113.266-.25.09-.656.54-1.134 1.342-1.134.686 0 1.314.343 1.314 1.168 0 .635-.374.927-.965 1.371-.673.489-1.206 1.06-1.168 1.987l.003.217a.25.25 0 00.25.246h.811a.25.25 0 00.25-.25v-.105c0-.718.273-.927 1.01-1.486.609-.463 1.244-.977 1.244-2.056 0-1.511-1.276-2.241-2.673-2.241-1.267 0-2.655.59-2.75 2.286zm1.557 5.763c0 .533.425.927 1.01.927.609 0 1.028-.394 1.028-.927 0-.552-.42-.94-1.029-.94-.584 0-1.009.388-1.009.94z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-question-square-fill" fill="currentColor" id="question-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm3.496 6.033a.237.237 0 01-.24-.247C5.35 4.091 6.737 3.5 8.005 3.5c1.396 0 2.672.73 2.672 2.24 0 1.08-.635 1.594-1.244 2.057-.737.559-1.01.768-1.01 1.486v.105a.25.25 0 01-.25.25h-.81a.25.25 0 01-.25-.246l-.004-.217c-.038-.927.495-1.498 1.168-1.987.59-.444.965-.736.965-1.371 0-.825-.628-1.168-1.314-1.168-.803 0-1.253.478-1.342 1.134-.018.137-.128.25-.266.25h-.825zm2.325 6.443c-.584 0-1.009-.394-1.009-.927 0-.552.425-.94 1.01-.94.609 0 1.028.388 1.028.94 0 .533-.42.927-1.029.927z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-receipt" fill="currentColor" id="receipt" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.92.506a.5.5 0 01.434.14L3 1.293l.646-.647a.5.5 0 01.708 0L5 1.293l.646-.647a.5.5 0 01.708 0L7 1.293l.646-.647a.5.5 0 01.708 0L9 1.293l.646-.647a.5.5 0 01.708 0l.646.647.646-.647a.5.5 0 01.708 0l.646.647.646-.647a.5.5 0 01.801.13l.5 1A.5.5 0 0115 2v12a.5.5 0 01-.053.224l-.5 1a.5.5 0 01-.8.13L13 14.707l-.646.647a.5.5 0 01-.708 0L11 14.707l-.646.647a.5.5 0 01-.708 0L9 14.707l-.646.647a.5.5 0 01-.708 0L7 14.707l-.646.647a.5.5 0 01-.708 0L5 14.707l-.646.647a.5.5 0 01-.708 0L3 14.707l-.646.647a.5.5 0 01-.801-.13l-.5-1A.5.5 0 011 14V2a.5.5 0 01.053-.224l.5-1a.5.5 0 01.367-.27zm.217 1.338L2 2.118v11.764l.137.274.51-.51a.5.5 0 01.707 0l.646.647.646-.646a.5.5 0 01.708 0l.646.646.646-.646a.5.5 0 01.708 0l.646.646.646-.646a.5.5 0 01.708 0l.646.646.646-.646a.5.5 0 01.708 0l.646.646.646-.646a.5.5 0 01.708 0l.509.509.137-.274V2.118l-.137-.274-.51.51a.5.5 0 01-.707 0L12 1.707l-.646.647a.5.5 0 01-.708 0L10 1.707l-.646.647a.5.5 0 01-.708 0L8 1.707l-.646.647a.5.5 0 01-.708 0L6 1.707l-.646.647a.5.5 0 01-.708 0L4 1.707l-.646.647a.5.5 0 01-.708 0l-.509-.51z"/><path fill-rule="evenodd" d="M3 4.5a.5.5 0 01.5-.5h6a.5.5 0 110 1h-6a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h6a.5.5 0 110 1h-6a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h6a.5.5 0 110 1h-6a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm8-6a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-receipt-cutoff" fill="currentColor" id="receipt-cutoff" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.92.506a.5.5 0 01.434.14L3 1.293l.646-.647a.5.5 0 01.708 0L5 1.293l.646-.647a.5.5 0 01.708 0L7 1.293l.646-.647a.5.5 0 01.708 0L9 1.293l.646-.647a.5.5 0 01.708 0l.646.647.646-.647a.5.5 0 01.708 0l.646.647.646-.647a.5.5 0 01.801.13l.5 1A.5.5 0 0115 2v13h-1V2.118l-.137-.274-.51.51a.5.5 0 01-.707 0L12 1.707l-.646.647a.5.5 0 01-.708 0L10 1.707l-.646.647a.5.5 0 01-.708 0L8 1.707l-.646.647a.5.5 0 01-.708 0L6 1.707l-.646.647a.5.5 0 01-.708 0L4 1.707l-.646.647a.5.5 0 01-.708 0l-.509-.51L2 2.118V15H1V2a.5.5 0 01.053-.224l.5-1a.5.5 0 01.367-.27zM0 15.5a.5.5 0 01.5-.5h15a.5.5 0 010 1H.5a.5.5 0 01-.5-.5z"/><path fill-rule="evenodd" d="M3 4.5a.5.5 0 01.5-.5h6a.5.5 0 110 1h-6a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h6a.5.5 0 110 1h-6a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h6a.5.5 0 110 1h-6a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm8-8a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5zm0 2a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-reception-0" fill="currentColor" id="reception-0" xmlns="http://www.w3.org/2000/svg"><path d="M0 13.5a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5zm4 0a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5zm4 0a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5zm4 0a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-reception-1" fill="currentColor" id="reception-1" xmlns="http://www.w3.org/2000/svg"><path d="M0 11.5a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v2a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-2zm4 2a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5zm4 0a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5zm4 0a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-reception-2" fill="currentColor" id="reception-2" xmlns="http://www.w3.org/2000/svg"><path d="M0 11.5a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v2a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-2zm4-3a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v5a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-5zm4 5a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5zm4 0a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-reception-3" fill="currentColor" id="reception-3" xmlns="http://www.w3.org/2000/svg"><path d="M0 11.5a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v2a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-2zm4-3a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v5a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-5zm4-3a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v8a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-8zm4 8a.5.5 0 01.5-.5h2a.5.5 0 010 1h-2a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-reception-4" fill="currentColor" id="reception-4" xmlns="http://www.w3.org/2000/svg"><path d="M0 11.5a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v2a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-2zm4-3a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v5a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-5zm4-3a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v8a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-8zm4-3a.5.5 0 01.5-.5h2a.5.5 0 01.5.5v11a.5.5 0 01-.5.5h-2a.5.5 0 01-.5-.5v-11z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-reply" fill="currentColor" id="reply" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.502 5.013a.144.144 0 00-.202.134V6.3a.5.5 0 01-.5.5c-.667 0-2.013.005-3.3.822-.984.624-1.99 1.76-2.595 3.876C3.925 10.515 5.09 9.982 6.11 9.7a8.741 8.741 0 011.921-.306 7.403 7.403 0 01.798.008h.013l.005.001h.001L8.8 9.9l.05-.498a.5.5 0 01.45.498v1.153c0 .108.11.176.202.134l3.984-2.933a.494.494 0 01.042-.028.147.147 0 000-.252.494.494 0 01-.042-.028L9.502 5.013zM8.3 10.386a7.745 7.745 0 00-1.923.277c-1.326.368-2.896 1.201-3.94 3.08a.5.5 0 01-.933-.305c.464-3.71 1.886-5.662 3.46-6.66 1.245-.79 2.527-.942 3.336-.971v-.66a1.144 1.144 0 011.767-.96l3.994 2.94a1.147 1.147 0 010 1.946l-3.994 2.94a1.144 1.144 0 01-1.767-.96v-.667z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-reply-all" fill="currentColor" id="reply-all" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.002 5.013a.144.144 0 00-.202.134V6.3a.5.5 0 01-.5.5c-.667 0-2.013.005-3.3.822-.984.624-1.99 1.76-2.595 3.876C2.425 10.515 3.59 9.982 4.61 9.7a8.741 8.741 0 011.921-.306 7.403 7.403 0 01.798.008h.013l.005.001h.001L7.3 9.9l.05-.498a.5.5 0 01.45.498v1.153c0 .108.11.176.202.134l3.984-2.933a.494.494 0 01.042-.028.147.147 0 000-.252.494.494 0 01-.042-.028L8.002 5.013zM6.8 10.386a7.745 7.745 0 00-1.923.277c-1.326.368-2.896 1.201-3.94 3.08a.5.5 0 01-.933-.305c.464-3.71 1.886-5.662 3.46-6.66 1.245-.79 2.527-.942 3.336-.971v-.66a1.144 1.144 0 011.767-.96l3.994 2.94a1.147 1.147 0 010 1.946l-3.994 2.94a1.144 1.144 0 01-1.767-.96v-.667z"/><path fill-rule="evenodd" d="M10.868 4.293a.5.5 0 01.7-.106l3.993 2.94a1.147 1.147 0 010 1.946l-3.994 2.94a.5.5 0 01-.593-.805l4.012-2.954a.493.493 0 01.042-.028.147.147 0 000-.252.496.496 0 01-.042-.028l-4.012-2.954a.5.5 0 01-.106-.699z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-reply-all-fill" fill="currentColor" id="reply-all-fill" xmlns="http://www.w3.org/2000/svg"><path d="M8.079 11.9l4.568-3.281a.719.719 0 000-1.238L8.079 4.1A.716.716 0 007 4.719V6c-1.5 0-6 0-7 8 2.5-4.5 7-4 7-4v1.281c0 .56.606.898 1.079.62z"/><path fill-rule="evenodd" d="M10.868 4.293a.5.5 0 01.7-.106l3.993 2.94a1.147 1.147 0 010 1.946l-3.994 2.94a.5.5 0 01-.593-.805l4.012-2.954a.493.493 0 01.042-.028.147.147 0 000-.252.496.496 0 01-.042-.028l-4.012-2.954a.5.5 0 01-.106-.699z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-reply-fill" fill="currentColor" id="reply-fill" xmlns="http://www.w3.org/2000/svg"><path d="M9.079 11.9l4.568-3.281a.719.719 0 000-1.238L9.079 4.1A.716.716 0 008 4.719V6c-1.5 0-6 0-7 8 2.5-4.5 7-4 7-4v1.281c0 .56.606.898 1.079.62z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-rss" fill="currentColor" id="rss" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path d="M5.5 12a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/><path fill-rule="evenodd" d="M2.5 3.5a1 1 0 011-1c5.523 0 10 4.477 10 10a1 1 0 11-2 0 8 8 0 00-8-8 1 1 0 01-1-1zm0 4a1 1 0 011-1 6 6 0 016 6 1 1 0 11-2 0 4 4 0 00-4-4 1 1 0 01-1-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-rss-fill" fill="currentColor" id="rss-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm1.5 2.5a1 1 0 000 2 8 8 0 018 8 1 1 0 102 0c0-5.523-4.477-10-10-10zm0 4a1 1 0 000 2 4 4 0 014 4 1 1 0 102 0 6 6 0 00-6-6zm.5 7a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-scissors" fill="currentColor" id="scissors" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 3.5c-.614-.884-.074-1.962.858-2.5L8 7.226 11.642 1c.932.538 1.472 1.616.858 2.5L8.81 8.61l1.556 2.661a2.5 2.5 0 11-.794.637L8 9.73l-1.572 2.177a2.5 2.5 0 11-.794-.637L7.19 8.61 3.5 3.5zm2.5 10a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm7 0a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-screwdriver" fill="currentColor" id="screwdriver" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1l1-1 3.081 2.2a1 1 0 01.419.815v.07a1 1 0 00.293.708L10.5 9.5l.914-.305a1 1 0 011.023.242l3.356 3.356a1 1 0 010 1.414l-1.586 1.586a1 1 0 01-1.414 0l-3.356-3.356a1 1 0 01-.242-1.023L9.5 10.5 3.793 4.793a1 1 0 00-.707-.293h-.071a1 1 0 01-.814-.419L0 1zm11.354 9.646a.5.5 0 00-.708.708l3 3a.5.5 0 00.708-.708l-3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-search" fill="currentColor" id="search" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.442 10.442a1 1 0 011.415 0l3.85 3.85a1 1 0 01-1.414 1.415l-3.85-3.85a1 1 0 010-1.415z"/><path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 100-11 5.5 5.5 0 000 11zM13 6.5a6.5 6.5 0 11-13 0 6.5 6.5 0 0113 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-segmented-nav" fill="currentColor" id="segmented-nav" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 5H6v4h8a1 1 0 001-1V6a1 1 0 00-1-1zM2 4a2 2 0 00-2 2v2a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M10 9V5h1v4h-1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-server" fill="currentColor" id="server" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.333 2.667C1.333 1.194 4.318 0 8 0s6.667 1.194 6.667 2.667V4C14.665 5.474 11.68 6.667 8 6.667 4.318 6.667 1.333 5.473 1.333 4V2.667zm0 3.667v3C1.333 10.805 4.318 12 8 12c3.68 0 6.665-1.193 6.667-2.665V6.334c-.43.32-.931.58-1.458.79C11.81 7.684 9.967 8 8 8c-1.967 0-3.81-.317-5.21-.876a6.508 6.508 0 01-1.457-.79zm13.334 5.334c-.43.319-.931.578-1.458.789-1.4.56-3.242.876-5.209.876-1.967 0-3.81-.316-5.21-.876a6.51 6.51 0 01-1.457-.79v1.666C1.333 14.806 4.318 16 8 16s6.667-1.194 6.667-2.667v-1.665z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-share" fill="currentColor" id="share" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M13.5 1a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM11 2.5a2.5 2.5 0 11.603 1.628l-6.718 3.12a2.499 2.499 0 010 1.504l6.718 3.12a2.5 2.5 0 11-.488.876l-6.718-3.12a2.5 2.5 0 110-3.256l6.718-3.12A2.5 2.5 0 0111 2.5zm-8.5 4a1.5 1.5 0 100 3 1.5 1.5 0 000-3zm11 5.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-share-fill" fill="currentColor" id="share-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11 2.5a2.5 2.5 0 11.603 1.628l-6.718 3.12a2.499 2.499 0 010 1.504l6.718 3.12a2.5 2.5 0 11-.488.876l-6.718-3.12a2.5 2.5 0 110-3.256l6.718-3.12A2.5 2.5 0 0111 2.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield" fill="currentColor" id="shield" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.443 1.991a60.17 60.17 0 00-2.725.802.454.454 0 00-.315.366C1.87 7.056 3.1 9.9 4.567 11.773c.736.94 1.533 1.636 2.197 2.093.333.228.626.394.857.5.116.053.21.089.282.11A.73.73 0 008 14.5c.007-.001.038-.005.097-.023.072-.022.166-.058.282-.111.23-.106.525-.272.857-.5a10.197 10.197 0 002.197-2.093C12.9 9.9 14.13 7.056 13.597 3.159a.454.454 0 00-.315-.366c-.626-.2-1.682-.526-2.725-.802C9.491 1.71 8.51 1.5 8 1.5c-.51 0-1.49.21-2.557.491zm-.256-.966C6.23.749 7.337.5 8 .5c.662 0 1.77.249 2.813.525a61.09 61.09 0 012.772.815c.528.168.926.623 1.003 1.184.573 4.197-.756 7.307-2.367 9.365a11.191 11.191 0 01-2.418 2.3 6.942 6.942 0 01-1.007.586c-.27.124-.558.225-.796.225s-.526-.101-.796-.225a6.908 6.908 0 01-1.007-.586 11.192 11.192 0 01-2.417-2.3C2.167 10.331.839 7.221 1.412 3.024A1.454 1.454 0 012.415 1.84a61.11 61.11 0 012.772-.815z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-check" fill="currentColor" id="shield-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.443 1.991a60.17 60.17 0 00-2.725.802.454.454 0 00-.315.366C1.87 7.056 3.1 9.9 4.567 11.773c.736.94 1.533 1.636 2.197 2.093.333.228.626.394.857.5.116.053.21.089.282.11A.73.73 0 008 14.5c.007-.001.038-.005.097-.023.072-.022.166-.058.282-.111.23-.106.525-.272.857-.5a10.197 10.197 0 002.197-2.093C12.9 9.9 14.13 7.056 13.597 3.159a.454.454 0 00-.315-.366c-.626-.2-1.682-.526-2.725-.802C9.491 1.71 8.51 1.5 8 1.5c-.51 0-1.49.21-2.557.491zm-.256-.966C6.23.749 7.337.5 8 .5c.662 0 1.77.249 2.813.525a61.09 61.09 0 012.772.815c.528.168.926.623 1.003 1.184.573 4.197-.756 7.307-2.367 9.365a11.191 11.191 0 01-2.418 2.3 6.942 6.942 0 01-1.007.586c-.27.124-.558.225-.796.225s-.526-.101-.796-.225a6.908 6.908 0 01-1.007-.586 11.192 11.192 0 01-2.417-2.3C2.167 10.331.839 7.221 1.412 3.024A1.454 1.454 0 012.415 1.84a61.11 61.11 0 012.772-.815z"/><path fill-rule="evenodd" d="M10.854 6.146a.5.5 0 010 .708l-3 3a.5.5 0 01-.708 0l-1.5-1.5a.5.5 0 11.708-.708L7.5 8.793l2.646-2.647a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-exclamation" fill="currentColor" id="shield-exclamation" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.443 1.991a60.17 60.17 0 00-2.725.802.454.454 0 00-.315.366C1.87 7.056 3.1 9.9 4.567 11.773c.736.94 1.533 1.636 2.197 2.093.333.228.626.394.857.5.116.053.21.089.282.11A.73.73 0 008 14.5c.007-.001.038-.005.097-.023.072-.022.166-.058.282-.111.23-.106.525-.272.857-.5a10.197 10.197 0 002.197-2.093C12.9 9.9 14.13 7.056 13.597 3.159a.454.454 0 00-.315-.366c-.626-.2-1.682-.526-2.725-.802C9.491 1.71 8.51 1.5 8 1.5c-.51 0-1.49.21-2.557.491zm-.256-.966C6.23.749 7.337.5 8 .5c.662 0 1.77.249 2.813.525a61.09 61.09 0 012.772.815c.528.168.926.623 1.003 1.184.573 4.197-.756 7.307-2.367 9.365a11.191 11.191 0 01-2.418 2.3 6.942 6.942 0 01-1.007.586c-.27.124-.558.225-.796.225s-.526-.101-.796-.225a6.908 6.908 0 01-1.007-.586 11.192 11.192 0 01-2.417-2.3C2.167 10.331.839 7.221 1.412 3.024A1.454 1.454 0 012.415 1.84a61.11 61.11 0 012.772-.815z"/><path d="M7.002 11a1 1 0 112 0 1 1 0 01-2 0zM7.1 4.995a.905.905 0 111.8 0l-.35 3.507a.552.552 0 01-1.1 0L7.1 4.995z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-fill" fill="currentColor" id="shield-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.187 1.025C6.23.749 7.337.5 8 .5c.662 0 1.77.249 2.813.525a61.09 61.09 0 012.772.815c.528.168.926.623 1.003 1.184.573 4.197-.756 7.307-2.367 9.365a11.191 11.191 0 01-2.418 2.3 6.942 6.942 0 01-1.007.586c-.27.124-.558.225-.796.225s-.526-.101-.796-.225a6.908 6.908 0 01-1.007-.586 11.192 11.192 0 01-2.417-2.3C2.167 10.331.839 7.221 1.412 3.024A1.454 1.454 0 012.415 1.84a61.11 61.11 0 012.772-.815z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-fill-check" fill="currentColor" id="shield-fill-check" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 .5c-.662 0-1.77.249-2.813.525a61.11 61.11 0 00-2.772.815 1.454 1.454 0 00-1.003 1.184c-.573 4.197.756 7.307 2.368 9.365a11.192 11.192 0 002.417 2.3c.371.256.715.451 1.007.586.27.124.558.225.796.225s.527-.101.796-.225c.292-.135.636-.33 1.007-.586a11.191 11.191 0 002.418-2.3c1.611-2.058 2.94-5.168 2.367-9.365a1.454 1.454 0 00-1.003-1.184 61.09 61.09 0 00-2.772-.815C9.77.749 8.663.5 8 .5zm2.854 6.354a.5.5 0 00-.708-.708L7.5 8.793 6.354 7.646a.5.5 0 10-.708.708l1.5 1.5a.5.5 0 00.708 0l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-fill-exclamation" fill="currentColor" id="shield-fill-exclamation" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 .5c-.662 0-1.77.249-2.813.525a61.11 61.11 0 00-2.772.815 1.454 1.454 0 00-1.003 1.184c-.573 4.197.756 7.307 2.368 9.365a11.192 11.192 0 002.417 2.3c.371.256.715.451 1.007.586.27.124.558.225.796.225s.527-.101.796-.225c.292-.135.636-.33 1.007-.586a11.191 11.191 0 002.418-2.3c1.611-2.058 2.94-5.168 2.367-9.365a1.454 1.454 0 00-1.003-1.184 61.09 61.09 0 00-2.772-.815C9.77.749 8.663.5 8 .5zM8 4a.905.905 0 00-.9.995l.35 3.507a.553.553 0 001.1 0l.35-3.507A.905.905 0 008 4zm.002 6a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-fill-minus" fill="currentColor" id="shield-fill-minus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 .5c-.662 0-1.77.249-2.813.525a61.11 61.11 0 00-2.772.815 1.454 1.454 0 00-1.003 1.184c-.573 4.197.756 7.307 2.368 9.365a11.192 11.192 0 002.417 2.3c.371.256.715.451 1.007.586.27.124.558.225.796.225s.527-.101.796-.225c.292-.135.636-.33 1.007-.586a11.191 11.191 0 002.418-2.3c1.611-2.058 2.94-5.168 2.367-9.365a1.454 1.454 0 00-1.003-1.184 61.09 61.09 0 00-2.772-.815C9.77.749 8.663.5 8 .5zm-2 7a.5.5 0 000 1h4a.5.5 0 000-1H6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-fill-plus" fill="currentColor" id="shield-fill-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 .5c-.662 0-1.77.249-2.813.525a61.11 61.11 0 00-2.772.815 1.454 1.454 0 00-1.003 1.184c-.573 4.197.756 7.307 2.368 9.365a11.192 11.192 0 002.417 2.3c.371.256.715.451 1.007.586.27.124.558.225.796.225s.527-.101.796-.225c.292-.135.636-.33 1.007-.586a11.191 11.191 0 002.418-2.3c1.611-2.058 2.94-5.168 2.367-9.365a1.454 1.454 0 00-1.003-1.184 61.09 61.09 0 00-2.772-.815C9.77.749 8.663.5 8 .5zM8.5 6a.5.5 0 00-1 0v1.5H6a.5.5 0 000 1h1.5V10a.5.5 0 001 0V8.5H10a.5.5 0 000-1H8.5V6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-fill-x" fill="currentColor" id="shield-fill-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 .5c-.662 0-1.77.249-2.813.525a61.11 61.11 0 00-2.772.815 1.454 1.454 0 00-1.003 1.184c-.573 4.197.756 7.307 2.368 9.365a11.192 11.192 0 002.417 2.3c.371.256.715.451 1.007.586.27.124.558.225.796.225s.527-.101.796-.225c.292-.135.636-.33 1.007-.586a11.191 11.191 0 002.418-2.3c1.611-2.058 2.94-5.168 2.367-9.365a1.454 1.454 0 00-1.003-1.184 61.09 61.09 0 00-2.772-.815C9.77.749 8.663.5 8 .5zM6.854 6.146a.5.5 0 10-.708.708L7.293 8 6.146 9.146a.5.5 0 10.708.708L8 8.707l1.146 1.147a.5.5 0 00.708-.708L8.707 8l1.147-1.146a.5.5 0 00-.708-.708L8 7.293 6.854 6.146z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-lock" fill="currentColor" id="shield-lock" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.443 1.991a60.17 60.17 0 00-2.725.802.454.454 0 00-.315.366C1.87 7.056 3.1 9.9 4.567 11.773c.736.94 1.533 1.636 2.197 2.093.333.228.626.394.857.5.116.053.21.089.282.11A.73.73 0 008 14.5c.007-.001.038-.005.097-.023.072-.022.166-.058.282-.111.23-.106.525-.272.857-.5a10.197 10.197 0 002.197-2.093C12.9 9.9 14.13 7.056 13.597 3.159a.454.454 0 00-.315-.366c-.626-.2-1.682-.526-2.725-.802C9.491 1.71 8.51 1.5 8 1.5c-.51 0-1.49.21-2.557.491zm-.256-.966C6.23.749 7.337.5 8 .5c.662 0 1.77.249 2.813.525a61.09 61.09 0 012.772.815c.528.168.926.623 1.003 1.184.573 4.197-.756 7.307-2.367 9.365a11.191 11.191 0 01-2.418 2.3 6.942 6.942 0 01-1.007.586c-.27.124-.558.225-.796.225s-.526-.101-.796-.225a6.908 6.908 0 01-1.007-.586 11.192 11.192 0 01-2.417-2.3C2.167 10.331.839 7.221 1.412 3.024A1.454 1.454 0 012.415 1.84a61.11 61.11 0 012.772-.815z"/><path d="M9.5 6.5a1.5 1.5 0 01-1 1.415l.385 1.99a.5.5 0 01-.491.595h-.788a.5.5 0 01-.49-.595l.384-1.99a1.5 1.5 0 112-1.415z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-lock-fill" fill="currentColor" id="shield-lock-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 .5c-.662 0-1.77.249-2.813.525a61.11 61.11 0 00-2.772.815 1.454 1.454 0 00-1.003 1.184c-.573 4.197.756 7.307 2.368 9.365a11.192 11.192 0 002.417 2.3c.371.256.715.451 1.007.586.27.124.558.225.796.225s.527-.101.796-.225c.292-.135.636-.33 1.007-.586a11.191 11.191 0 002.418-2.3c1.611-2.058 2.94-5.168 2.367-9.365a1.454 1.454 0 00-1.003-1.184 61.09 61.09 0 00-2.772-.815C9.77.749 8.663.5 8 .5zm.5 7.415a1.5 1.5 0 10-1 0l-.385 1.99a.5.5 0 00.491.595h.788a.5.5 0 00.49-.595L8.5 7.915z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-minus" fill="currentColor" id="shield-minus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.443 1.991a60.17 60.17 0 00-2.725.802.454.454 0 00-.315.366C1.87 7.056 3.1 9.9 4.567 11.773c.736.94 1.533 1.636 2.197 2.093.333.228.626.394.857.5.116.053.21.089.282.11A.73.73 0 008 14.5c.007-.001.038-.005.097-.023.072-.022.166-.058.282-.111.23-.106.525-.272.857-.5a10.197 10.197 0 002.197-2.093C12.9 9.9 14.13 7.056 13.597 3.159a.454.454 0 00-.315-.366c-.626-.2-1.682-.526-2.725-.802C9.491 1.71 8.51 1.5 8 1.5c-.51 0-1.49.21-2.557.491zm-.256-.966C6.23.749 7.337.5 8 .5c.662 0 1.77.249 2.813.525a61.09 61.09 0 012.772.815c.528.168.926.623 1.003 1.184.573 4.197-.756 7.307-2.367 9.365a11.191 11.191 0 01-2.418 2.3 6.942 6.942 0 01-1.007.586c-.27.124-.558.225-.796.225s-.526-.101-.796-.225a6.908 6.908 0 01-1.007-.586 11.192 11.192 0 01-2.417-2.3C2.167 10.331.839 7.221 1.412 3.024A1.454 1.454 0 012.415 1.84a61.11 61.11 0 012.772-.815z"/><path fill-rule="evenodd" d="M5.5 8a.5.5 0 01.5-.5h4a.5.5 0 010 1H6a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-plus" fill="currentColor" id="shield-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.443 1.991a60.17 60.17 0 00-2.725.802.454.454 0 00-.315.366C1.87 7.056 3.1 9.9 4.567 11.773c.736.94 1.533 1.636 2.197 2.093.333.228.626.394.857.5.116.053.21.089.282.11A.73.73 0 008 14.5c.007-.001.038-.005.097-.023.072-.022.166-.058.282-.111.23-.106.525-.272.857-.5a10.197 10.197 0 002.197-2.093C12.9 9.9 14.13 7.056 13.597 3.159a.454.454 0 00-.315-.366c-.626-.2-1.682-.526-2.725-.802C9.491 1.71 8.51 1.5 8 1.5c-.51 0-1.49.21-2.557.491zm-.256-.966C6.23.749 7.337.5 8 .5c.662 0 1.77.249 2.813.525a61.09 61.09 0 012.772.815c.528.168.926.623 1.003 1.184.573 4.197-.756 7.307-2.367 9.365a11.191 11.191 0 01-2.418 2.3 6.942 6.942 0 01-1.007.586c-.27.124-.558.225-.796.225s-.526-.101-.796-.225a6.908 6.908 0 01-1.007-.586 11.192 11.192 0 01-2.417-2.3C2.167 10.331.839 7.221 1.412 3.024A1.454 1.454 0 012.415 1.84a61.11 61.11 0 012.772-.815z"/><path fill-rule="evenodd" d="M8 5.5a.5.5 0 01.5.5v1.5H10a.5.5 0 010 1H8.5V10a.5.5 0 01-1 0V8.5H6a.5.5 0 010-1h1.5V6a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-shaded" fill="currentColor" id="shield-shaded" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.443 1.991a60.17 60.17 0 00-2.725.802.454.454 0 00-.315.366C1.87 7.056 3.1 9.9 4.567 11.773c.736.94 1.533 1.636 2.197 2.093.333.228.626.394.857.5.116.053.21.089.282.11A.73.73 0 008 14.5c.007-.001.038-.005.097-.023.072-.022.166-.058.282-.111.23-.106.525-.272.857-.5a10.197 10.197 0 002.197-2.093C12.9 9.9 14.13 7.056 13.597 3.159a.454.454 0 00-.315-.366c-.626-.2-1.682-.526-2.725-.802C9.491 1.71 8.51 1.5 8 1.5c-.51 0-1.49.21-2.557.491zm-.256-.966C6.23.749 7.337.5 8 .5c.662 0 1.77.249 2.813.525a61.09 61.09 0 012.772.815c.528.168.926.623 1.003 1.184.573 4.197-.756 7.307-2.367 9.365a11.191 11.191 0 01-2.418 2.3 6.942 6.942 0 01-1.007.586c-.27.124-.558.225-.796.225s-.526-.101-.796-.225a6.908 6.908 0 01-1.007-.586 11.192 11.192 0 01-2.417-2.3C2.167 10.331.839 7.221 1.412 3.024A1.454 1.454 0 012.415 1.84a61.11 61.11 0 012.772-.815z"/><path d="M8 2.25c.909 0 3.188.685 4.254 1.022a.94.94 0 01.656.773c.814 6.424-4.13 9.452-4.91 9.452V2.25z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-slash" fill="currentColor" id="shield-slash" xmlns="http://www.w3.org/2000/svg"><path d="M1.357 3.478c-.42 3.969.87 6.928 2.423 8.911a11.192 11.192 0 002.417 2.3c.371.256.715.451 1.007.586.27.124.558.225.796.225s.527-.101.796-.225c.292-.135.636-.33 1.007-.586.466-.32.983-.74 1.502-1.263l-.707-.707a9.692 9.692 0 01-1.362 1.147 5.934 5.934 0 01-.857.5c-.116.053-.21.089-.282.11A.73.73 0 018 14.5c-.007-.001-.038-.005-.097-.023a2.273 2.273 0 01-.282-.111 5.934 5.934 0 01-.857-.5 10.197 10.197 0 01-2.197-2.093C3.262 10.107 2.145 7.672 2.289 4.41l-.932-.932zm11.053 6.81c.971-1.785 1.594-4.15 1.187-7.129a.454.454 0 00-.315-.366c-.626-.2-1.682-.526-2.725-.802C9.491 1.71 8.51 1.5 8 1.5c-.51 0-1.49.21-2.557.491a45.4 45.4 0 00-1.041.29l-.806-.806a52.727 52.727 0 011.591-.45C6.23.749 7.337.5 8 .5c.662 0 1.77.249 2.813.525a61.09 61.09 0 012.772.815c.528.168.926.623 1.003 1.184.458 3.355-.299 6.015-1.444 7.999l-.735-.735z"/><path fill-rule="evenodd" d="M14.646 15.354l-14-14 .708-.708 14 14-.707.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-slash-fill" fill="currentColor" id="shield-slash-fill" xmlns="http://www.w3.org/2000/svg"><path d="M1.357 3.478c-.42 3.969.87 6.928 2.423 8.911a11.192 11.192 0 002.417 2.3c.371.256.715.451 1.007.586.27.124.558.225.796.225s.527-.101.796-.225c.292-.135.636-.33 1.007-.586.466-.32.983-.74 1.502-1.263L1.357 3.478zm11.787 7.545c1.145-1.984 1.902-4.644 1.444-8a1.454 1.454 0 00-1.003-1.183 61.09 61.09 0 00-2.772-.815C9.77.749 8.663.5 8 .5c-.662 0-1.77.249-2.813.525-.548.145-1.1.303-1.59.45l9.547 9.548z"/><path fill-rule="evenodd" d="M14.646 15.354l-14-14 .708-.708 14 14-.707.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shield-x" fill="currentColor" id="shield-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.443 1.991a60.17 60.17 0 00-2.725.802.454.454 0 00-.315.366C1.87 7.056 3.1 9.9 4.567 11.773c.736.94 1.533 1.636 2.197 2.093.333.228.626.394.857.5.116.053.21.089.282.11A.73.73 0 008 14.5c.007-.001.038-.005.097-.023.072-.022.166-.058.282-.111.23-.106.525-.272.857-.5a10.197 10.197 0 002.197-2.093C12.9 9.9 14.13 7.056 13.597 3.159a.454.454 0 00-.315-.366c-.626-.2-1.682-.526-2.725-.802C9.491 1.71 8.51 1.5 8 1.5c-.51 0-1.49.21-2.557.491zm-.256-.966C6.23.749 7.337.5 8 .5c.662 0 1.77.249 2.813.525a61.09 61.09 0 012.772.815c.528.168.926.623 1.003 1.184.573 4.197-.756 7.307-2.367 9.365a11.191 11.191 0 01-2.418 2.3 6.942 6.942 0 01-1.007.586c-.27.124-.558.225-.796.225s-.526-.101-.796-.225a6.908 6.908 0 01-1.007-.586 11.192 11.192 0 01-2.417-2.3C2.167 10.331.839 7.221 1.412 3.024A1.454 1.454 0 012.415 1.84a61.11 61.11 0 012.772-.815z"/><path fill-rule="evenodd" d="M6.146 6.146a.5.5 0 01.708 0L8 7.293l1.146-1.147a.5.5 0 11.708.708L8.707 8l1.147 1.146a.5.5 0 01-.708.708L8 8.707 6.854 9.854a.5.5 0 01-.708-.708L7.293 8 6.146 6.854a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shift" fill="currentColor" id="shift" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.27 2.047a1 1 0 011.46 0l6.345 6.77c.6.638.146 1.683-.73 1.683H11.5v3a1 1 0 01-1 1h-5a1 1 0 01-1-1v-3H1.654C.78 10.5.326 9.455.924 8.816L7.27 2.047zM14.346 9.5L8 2.731 1.654 9.5H4.5a1 1 0 011 1v3h5v-3a1 1 0 011-1h2.846z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shift-fill" fill="currentColor" id="shift-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.27 2.047a1 1 0 011.46 0l6.345 6.77c.6.638.146 1.683-.73 1.683H11.5v3a1 1 0 01-1 1h-5a1 1 0 01-1-1v-3H1.654C.78 10.5.326 9.455.924 8.816L7.27 2.047z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shop" fill="currentColor" id="shop" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.97 1.35A1 1 0 013.73 1h8.54a1 1 0 01.76.35l2.609 3.044A1.5 1.5 0 0116 5.37v.255a2.375 2.375 0 01-4.25 1.458A2.371 2.371 0 019.875 8 2.37 2.37 0 018 7.083 2.37 2.37 0 016.125 8a2.37 2.37 0 01-1.875-.917A2.375 2.375 0 010 5.625V5.37a1.5 1.5 0 01.361-.976l2.61-3.045zm1.78 4.275a1.375 1.375 0 002.75 0 .5.5 0 011 0 1.375 1.375 0 002.75 0 .5.5 0 011 0 1.375 1.375 0 102.75 0V5.37a.5.5 0 00-.12-.325L12.27 2H3.73L1.12 5.045A.5.5 0 001 5.37v.255a1.375 1.375 0 002.75 0 .5.5 0 011 0zM1.5 8.5A.5.5 0 012 9v6h1v-5a1 1 0 011-1h3a1 1 0 011 1v5h6V9a.5.5 0 011 0v6h.5a.5.5 0 010 1H.5a.5.5 0 010-1H1V9a.5.5 0 01.5-.5zM4 15h3v-5H4v5zm5-5a1 1 0 011-1h2a1 1 0 011 1v3a1 1 0 01-1 1h-2a1 1 0 01-1-1v-3zm3 0h-2v3h2v-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shop-window" fill="currentColor" id="shop-window" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.97 1.35A1 1 0 013.73 1h8.54a1 1 0 01.76.35l2.609 3.044A1.5 1.5 0 0116 5.37v.255a2.375 2.375 0 01-4.25 1.458A2.371 2.371 0 019.875 8 2.37 2.37 0 018 7.083 2.37 2.37 0 016.125 8a2.37 2.37 0 01-1.875-.917A2.375 2.375 0 010 5.625V5.37a1.5 1.5 0 01.361-.976l2.61-3.045zm1.78 4.275a1.375 1.375 0 002.75 0 .5.5 0 011 0 1.375 1.375 0 002.75 0 .5.5 0 011 0 1.375 1.375 0 102.75 0V5.37a.5.5 0 00-.12-.325L12.27 2H3.73L1.12 5.045A.5.5 0 001 5.37v.255a1.375 1.375 0 002.75 0 .5.5 0 011 0zM1.5 8.5A.5.5 0 012 9v6h12V9a.5.5 0 011 0v6h.5a.5.5 0 010 1H.5a.5.5 0 010-1H1V9a.5.5 0 01.5-.5zm2 .5a.5.5 0 01.5.5V13h8V9.5a.5.5 0 011 0V13a1 1 0 01-1 1H4a1 1 0 01-1-1V9.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-shuffle" fill="currentColor" id="shuffle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 3.5A.5.5 0 01.5 3H1c2.202 0 3.827 1.24 4.874 2.418.49.552.865 1.102 1.126 1.532.26-.43.636-.98 1.126-1.532C9.173 4.24 10.798 3 13 3v1c-1.798 0-3.173 1.01-4.126 2.082A9.624 9.624 0 007.556 8a9.624 9.624 0 001.317 1.918C9.828 10.99 11.204 12 13 12v1c-2.202 0-3.827-1.24-4.874-2.418A10.595 10.595 0 017 9.05c-.26.43-.636.98-1.126 1.532C4.827 11.76 3.202 13 1 13H.5a.5.5 0 010-1H1c1.798 0 3.173-1.01 4.126-2.082A9.624 9.624 0 006.444 8a9.624 9.624 0 00-1.317-1.918C4.172 5.01 2.796 4 1 4H.5a.5.5 0 01-.5-.5z"/><path d="M13 5.466V1.534a.25.25 0 01.41-.192l2.36 1.966c.12.1.12.284 0 .384l-2.36 1.966a.25.25 0 01-.41-.192zm0 9v-3.932a.25.25 0 01.41-.192l2.36 1.966c.12.1.12.284 0 .384l-2.36 1.966a.25.25 0 01-.41-.192z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-signpost" fill="currentColor" id="signpost" xmlns="http://www.w3.org/2000/svg"><path d="M7 1.414V4h2V1.414a1 1 0 00-2 0z"/><path fill-rule="evenodd" d="M12.532 5H2v4h10.532l1.666-2-1.666-2zM2 4a1 1 0 00-1 1v4a1 1 0 001 1h10.532a1 1 0 00.768-.36l1.933-2.32a.5.5 0 000-.64L13.3 4.36a1 1 0 00-.768-.36H2z"/><path d="M7 10h2v6H7v-6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-signpost-2" fill="currentColor" id="signpost-2" xmlns="http://www.w3.org/2000/svg"><path d="M7 1.414V2h2v-.586a1 1 0 00-2 0z"/><path fill-rule="evenodd" d="M13.5 3H2v2h11.5l.75-1-.75-1zM2 2a1 1 0 00-1 1v2a1 1 0 001 1h11.5a1 1 0 00.8-.4l.975-1.3a.5.5 0 000-.6L14.3 2.4a1 1 0 00-.8-.4H2zm.5 6H14v2H2.5l-.75-1 .75-1zM14 7a1 1 0 011 1v2a1 1 0 01-1 1H2.5a1 1 0 01-.8-.4L.725 9.3a.5.5 0 010-.6L1.7 7.4a1 1 0 01.8-.4H14z"/><path d="M7 6h2v1H7V6zm0 5h2v5H7v-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-signpost-2-fill" fill="currentColor" id="signpost-2-fill" xmlns="http://www.w3.org/2000/svg"><path d="M7 1.414V16h2V1.414a1 1 0 00-2 0z"/><path d="M1 3a1 1 0 011-1h11.5a1 1 0 01.8.4l.975 1.3a.5.5 0 010 .6L14.3 5.6a1 1 0 01-.8.4H2a1 1 0 01-1-1V3zm14 5a1 1 0 00-1-1H2.5a1 1 0 00-.8.4L.725 8.7a.5.5 0 000 .6l.975 1.3a1 1 0 00.8.4H14a1 1 0 001-1V8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-signpost-fill" fill="currentColor" id="signpost-fill" xmlns="http://www.w3.org/2000/svg"><path d="M7 1.414V4h2V1.414a1 1 0 00-2 0zM1 5a1 1 0 011-1h10.532a1 1 0 01.768.36l1.933 2.32a.5.5 0 010 .64L13.3 9.64a1 1 0 01-.768.36H2a1 1 0 01-1-1V5zm6 5h2v6H7v-6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-signpost-split" fill="currentColor" id="signpost-split" xmlns="http://www.w3.org/2000/svg"><path d="M7 16h2V6H8V2h1v-.586a1 1 0 00-2 0V7h1v4H7v5z"/><path fill-rule="evenodd" d="M14 3H8v2h6l.75-1L14 3zM8 2a1 1 0 00-1 1v2a1 1 0 001 1h6a1 1 0 00.8-.4l.975-1.3a.5.5 0 000-.6L14.8 2.4A1 1 0 0014 2H8zM2 8h6v2H2l-.75-1L2 8zm6-1a1 1 0 011 1v2a1 1 0 01-1 1H2a1 1 0 01-.8-.4L.225 9.3a.5.5 0 010-.6L1.2 7.4A1 1 0 012 7h6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-signpost-split-fill" fill="currentColor" id="signpost-split-fill" xmlns="http://www.w3.org/2000/svg"><path d="M7 16h2V6h5a1 1 0 00.8-.4l.975-1.3a.5.5 0 000-.6L14.8 2.4A1 1 0 0014 2H9v-.586a1 1 0 00-2 0V7H2a1 1 0 00-.8.4L.225 8.7a.5.5 0 000 .6l.975 1.3a1 1 0 00.8.4h5v5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sim" fill="currentColor" id="sim" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 1.5A1.5 1.5 0 013.5 0h7.086a1.5 1.5 0 011.06.44l1.915 1.914A1.5 1.5 0 0114 3.414V14.5a1.5 1.5 0 01-1.5 1.5h-9A1.5 1.5 0 012 14.5v-13zM3.5 1a.5.5 0 00-.5.5v13a.5.5 0 00.5.5h9a.5.5 0 00.5-.5V3.414a.5.5 0 00-.146-.353l-1.915-1.915A.5.5 0 0010.586 1H3.5z"/><path fill-rule="evenodd" d="M5.5 4a.5.5 0 00-.5.5V6h2.5V4h-2zm3 0v2H11V4.5a.5.5 0 00-.5-.5h-2zM11 7H5v2h6V7zm0 3H8.5v2h2a.5.5 0 00.5-.5V10zm-3.5 2v-2H5v1.5a.5.5 0 00.5.5h2zM4 4.5A1.5 1.5 0 015.5 3h5A1.5 1.5 0 0112 4.5v7a1.5 1.5 0 01-1.5 1.5h-5A1.5 1.5 0 014 11.5v-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sim-fill" fill="currentColor" id="sim-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 0A1.5 1.5 0 002 1.5v13A1.5 1.5 0 003.5 16h9a1.5 1.5 0 001.5-1.5V3.414a1.5 1.5 0 00-.44-1.06L11.647.439A1.5 1.5 0 0010.586 0H3.5zM5 4.5a.5.5 0 01.5-.5h2v2H5V4.5zM8.5 6V4h2a.5.5 0 01.5.5V6H8.5zM5 7h6v2H5V7zm3.5 3H11v1.5a.5.5 0 01-.5.5h-2v-2zm-1 0v2h-2a.5.5 0 01-.5-.5V10h2.5zm-2-7A1.5 1.5 0 004 4.5v7A1.5 1.5 0 005.5 13h5a1.5 1.5 0 001.5-1.5v-7A1.5 1.5 0 0010.5 3h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-skip-backward" fill="currentColor" id="skip-backward" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.5 3.5A.5.5 0 011 4v3.248l6.267-3.636c.52-.302 1.233.043 1.233.696v2.94l6.267-3.636c.52-.302 1.233.043 1.233.696v7.384c0 .653-.713.998-1.233.696L8.5 8.752v2.94c0 .653-.713.998-1.233.696L1 8.752V12a.5.5 0 01-1 0V4a.5.5 0 01.5-.5zm7 1.133L1.696 8 7.5 11.367V4.633zm7.5 0L9.196 8 15 11.367V4.633z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-skip-backward-fill" fill="currentColor" id="skip-backward-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.5 3.5A.5.5 0 000 4v8a.5.5 0 001 0V4a.5.5 0 00-.5-.5z"/><path d="M.904 8.697l6.363 3.692c.54.313 1.233-.066 1.233-.697V4.308c0-.63-.692-1.01-1.233-.696L.904 7.304a.802.802 0 000 1.393z"/><path d="M8.404 8.697l6.363 3.692c.54.313 1.233-.066 1.233-.697V4.308c0-.63-.693-1.01-1.233-.696L8.404 7.304a.802.802 0 000 1.393z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-skip-end" fill="currentColor" id="skip-end" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 3.5a.5.5 0 01.5.5v8a.5.5 0 01-1 0V4a.5.5 0 01.5-.5z"/><path fill-rule="evenodd" d="M10.804 8L5 4.633v6.734L10.804 8zm.792-.696a.802.802 0 010 1.392l-6.363 3.692C4.713 12.69 4 12.345 4 11.692V4.308c0-.653.713-.998 1.233-.696l6.363 3.692z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-skip-end-fill" fill="currentColor" id="skip-end-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 3.5a.5.5 0 01.5.5v8a.5.5 0 01-1 0V4a.5.5 0 01.5-.5z"/><path d="M11.596 8.697l-6.363 3.692c-.54.313-1.233-.066-1.233-.697V4.308c0-.63.692-1.01 1.233-.696l6.363 3.692a.802.802 0 010 1.393z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-skip-forward" fill="currentColor" id="skip-forward" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15.5 3.5a.5.5 0 01.5.5v8a.5.5 0 01-1 0V8.752l-6.267 3.636c-.52.302-1.233-.043-1.233-.696v-2.94l-6.267 3.636C.713 12.69 0 12.345 0 11.692V4.308c0-.653.713-.998 1.233-.696L7.5 7.248v-2.94c0-.653.713-.998 1.233-.696L15 7.248V4a.5.5 0 01.5-.5zM1 4.633v6.734L6.804 8 1 4.633zm7.5 0v6.734L14.304 8 8.5 4.633z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-skip-forward-fill" fill="currentColor" id="skip-forward-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15.5 3.5a.5.5 0 01.5.5v8a.5.5 0 01-1 0V4a.5.5 0 01.5-.5z"/><path d="M7.596 8.697l-6.363 3.692C.693 12.702 0 12.322 0 11.692V4.308c0-.63.693-1.01 1.233-.696l6.363 3.692a.802.802 0 010 1.393z"/><path d="M15.096 8.697l-6.363 3.692c-.54.313-1.233-.066-1.233-.697V4.308c0-.63.693-1.01 1.233-.696l6.363 3.692a.802.802 0 010 1.393z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-skip-start" fill="currentColor" id="skip-start" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.5 3.5A.5.5 0 004 4v8a.5.5 0 001 0V4a.5.5 0 00-.5-.5z"/><path fill-rule="evenodd" d="M5.696 8L11.5 4.633v6.734L5.696 8zm-.792-.696a.802.802 0 000 1.392l6.363 3.692c.52.302 1.233-.043 1.233-.696V4.308c0-.653-.713-.998-1.233-.696L4.904 7.304z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-skip-start-fill" fill="currentColor" id="skip-start-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.5 3.5A.5.5 0 004 4v8a.5.5 0 001 0V4a.5.5 0 00-.5-.5z"/><path d="M4.903 8.697l6.364 3.692c.54.313 1.232-.066 1.232-.697V4.308c0-.63-.692-1.01-1.232-.696L4.903 7.304a.802.802 0 000 1.393z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-slash" fill="currentColor" id="slash" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.354 4.646a.5.5 0 010 .708l-6 6a.5.5 0 01-.708-.708l6-6a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-slash-circle" fill="currentColor" id="slash-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M11.354 4.646a.5.5 0 010 .708l-6 6a.5.5 0 01-.708-.708l6-6a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-slash-circle-fill" fill="currentColor" id="slash-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zm-4.646-2.646a.5.5 0 00-.708-.708l-6 6a.5.5 0 00.708.708l6-6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-slash-square" fill="currentColor" id="slash-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M11.354 4.646a.5.5 0 010 .708l-6 6a.5.5 0 01-.708-.708l6-6a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-slash-square-fill" fill="currentColor" id="slash-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm9.354 5.354a.5.5 0 00-.708-.708l-6 6a.5.5 0 00.708.708l6-6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sliders" fill="currentColor" id="sliders" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.5 2a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM9.05 3a2.5 2.5 0 014.9 0H16v1h-2.05a2.5 2.5 0 01-4.9 0H0V3h9.05zM4.5 7a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM2.05 8a2.5 2.5 0 014.9 0H16v1H6.95a2.5 2.5 0 01-4.9 0H0V8h2.05zm9.45 4a1.5 1.5 0 100 3 1.5 1.5 0 000-3zm-2.45 1a2.5 2.5 0 014.9 0H16v1h-2.05a2.5 2.5 0 01-4.9 0H0v-1h9.05z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-smartwatch" fill="currentColor" id="smartwatch" xmlns="http://www.w3.org/2000/svg"><path d="M14 5h.5a.5.5 0 01.5.5v2a.5.5 0 01-.5.5H14V5z"/><path fill-rule="evenodd" d="M8.5 4.5A.5.5 0 019 5v3.5a.5.5 0 01-.5.5H6a.5.5 0 010-1h2V5a.5.5 0 01.5-.5z"/><path fill-rule="evenodd" d="M4.5 2h7A2.5 2.5 0 0114 4.5v7a2.5 2.5 0 01-2.5 2.5h-7A2.5 2.5 0 012 11.5v-7A2.5 2.5 0 014.5 2zm0 1A1.5 1.5 0 003 4.5v7A1.5 1.5 0 004.5 13h7a1.5 1.5 0 001.5-1.5v-7A1.5 1.5 0 0011.5 3h-7z"/><path d="M4 2.05v-.383C4 .747 4.746 0 5.667 0h4.666C11.253 0 12 .746 12 1.667v.383a2.512 2.512 0 00-.5-.05h-7c-.171 0-.338.017-.5.05zm0 11.9c.162.033.329.05.5.05h7c.171 0 .338-.017.5-.05v.383c0 .92-.746 1.667-1.667 1.667H5.667C4.747 16 4 15.254 4 14.333v-.383z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-alpha-down" fill="currentColor" id="sort-alpha-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 2a.5.5 0 01.5.5v11a.5.5 0 01-1 0v-11A.5.5 0 014 2z"/><path fill-rule="evenodd" d="M6.354 11.146a.5.5 0 010 .708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 01.708-.708L4 12.793l1.646-1.647a.5.5 0 01.708 0z"/><path d="M9.664 7l.418-1.371h1.781L12.281 7h1.121l-1.78-5.332h-1.235L8.597 7h1.067zM11 2.687l.652 2.157h-1.351l.652-2.157H11zM9.027 14h3.934v-.867h-2.645v-.055l2.567-3.719v-.691H9.098v.867h2.507v.055l-2.578 3.719V14z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-alpha-down-alt" fill="currentColor" id="sort-alpha-down-alt" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 2a.5.5 0 01.5.5v11a.5.5 0 01-1 0v-11A.5.5 0 014 2z"/><path fill-rule="evenodd" d="M6.354 11.146a.5.5 0 010 .708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 01.708-.708L4 12.793l1.646-1.647a.5.5 0 01.708 0z"/><path d="M9.027 7h3.934v-.867h-2.645v-.055l2.567-3.719v-.691H9.098v.867h2.507v.055L9.027 6.309V7zm.637 7l.418-1.371h1.781L12.281 14h1.121l-1.78-5.332h-1.235L8.597 14h1.067zM11 9.687l.652 2.157h-1.351l.652-2.156H11z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-alpha-up" fill="currentColor" id="sort-alpha-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 14a.5.5 0 00.5-.5v-11a.5.5 0 00-1 0v11a.5.5 0 00.5.5z"/><path fill-rule="evenodd" d="M6.354 4.854a.5.5 0 000-.708l-2-2a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L4 3.207l1.646 1.647a.5.5 0 00.708 0z"/><path d="M9.664 7l.418-1.371h1.781L12.281 7h1.121l-1.78-5.332h-1.235L8.597 7h1.067zM11 2.687l.652 2.157h-1.351l.652-2.157H11zM9.027 14h3.934v-.867h-2.645v-.055l2.567-3.719v-.691H9.098v.867h2.507v.055l-2.578 3.719V14z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-alpha-up-alt" fill="currentColor" id="sort-alpha-up-alt" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 14a.5.5 0 00.5-.5v-11a.5.5 0 00-1 0v11a.5.5 0 00.5.5z"/><path fill-rule="evenodd" d="M6.354 4.854a.5.5 0 000-.708l-2-2a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L4 3.207l1.646 1.647a.5.5 0 00.708 0z"/><path d="M9.027 7h3.934v-.867h-2.645v-.055l2.567-3.719v-.691H9.098v.867h2.507v.055L9.027 6.309V7zm.637 7l.418-1.371h1.781L12.281 14h1.121l-1.78-5.332h-1.235L8.597 14h1.067zM11 9.687l.652 2.157h-1.351l.652-2.156H11z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-down" fill="currentColor" id="sort-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 2a.5.5 0 01.5.5v10a.5.5 0 01-1 0v-10A.5.5 0 013 2z"/><path fill-rule="evenodd" d="M5.354 10.146a.5.5 0 010 .708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 01.708-.708L3 11.793l1.646-1.647a.5.5 0 01.708 0zM7 9.5a.5.5 0 01.5-.5h3a.5.5 0 010 1h-3a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm0 9a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-down-alt" fill="currentColor" id="sort-down-alt" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 3a.5.5 0 01.5.5v10a.5.5 0 01-1 0v-10A.5.5 0 013 3z"/><path fill-rule="evenodd" d="M5.354 11.146a.5.5 0 010 .708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 01.708-.708L3 12.793l1.646-1.647a.5.5 0 01.708 0zM7 6.5a.5.5 0 00.5.5h3a.5.5 0 000-1h-3a.5.5 0 00-.5.5zm0 3a.5.5 0 00.5.5h5a.5.5 0 000-1h-5a.5.5 0 00-.5.5zm0 3a.5.5 0 00.5.5h7a.5.5 0 000-1h-7a.5.5 0 00-.5.5zm0-9a.5.5 0 00.5.5h1a.5.5 0 000-1h-1a.5.5 0 00-.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-numeric-down" fill="currentColor" id="sort-numeric-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 2a.5.5 0 01.5.5v11a.5.5 0 01-1 0v-11A.5.5 0 014 2z"/><path fill-rule="evenodd" d="M6.354 11.146a.5.5 0 010 .708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 01.708-.708L4 12.793l1.646-1.647a.5.5 0 01.708 0z"/><path d="M12.438 7V1.668H11.39l-1.262.906v.969l1.21-.86h.052V7h1.046zm-2.84 5.82c.054.621.625 1.278 1.761 1.278 1.422 0 2.145-.98 2.145-2.848 0-2.05-.973-2.688-2.063-2.688-1.125 0-1.972.688-1.972 1.836 0 1.145.808 1.758 1.719 1.758.69 0 1.113-.351 1.261-.742h.059c.031 1.027-.309 1.856-1.133 1.856-.43 0-.715-.227-.773-.45H9.598zm2.757-2.43c0 .637-.43.973-.933.973-.516 0-.934-.34-.934-.98 0-.625.407-1 .926-1 .543 0 .941.375.941 1.008z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-numeric-down-alt" fill="currentColor" id="sort-numeric-down-alt" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 2a.5.5 0 01.5.5v11a.5.5 0 01-1 0v-11A.5.5 0 014 2z"/><path fill-rule="evenodd" d="M6.354 11.146a.5.5 0 010 .708l-2 2a.5.5 0 01-.708 0l-2-2a.5.5 0 01.708-.708L4 12.793l1.646-1.647a.5.5 0 01.708 0z"/><path d="M9.598 5.82c.054.621.625 1.278 1.761 1.278 1.422 0 2.145-.98 2.145-2.848 0-2.05-.973-2.688-2.063-2.688-1.125 0-1.972.688-1.972 1.836 0 1.145.808 1.758 1.719 1.758.69 0 1.113-.351 1.261-.742h.059c.031 1.027-.309 1.856-1.133 1.856-.43 0-.715-.227-.773-.45H9.598zm2.757-2.43c0 .637-.43.973-.933.973-.516 0-.934-.34-.934-.98 0-.625.407-1 .926-1 .543 0 .941.375.941 1.008zM12.438 14V8.668H11.39l-1.262.906v.969l1.21-.86h.052V14h1.046z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-numeric-up" fill="currentColor" id="sort-numeric-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 14a.5.5 0 00.5-.5v-11a.5.5 0 00-1 0v11a.5.5 0 00.5.5z"/><path fill-rule="evenodd" d="M6.354 4.854a.5.5 0 000-.708l-2-2a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L4 3.207l1.646 1.647a.5.5 0 00.708 0z"/><path d="M12.438 7V1.668H11.39l-1.262.906v.969l1.21-.86h.052V7h1.046zm-2.84 5.82c.054.621.625 1.278 1.761 1.278 1.422 0 2.145-.98 2.145-2.848 0-2.05-.973-2.688-2.063-2.688-1.125 0-1.972.688-1.972 1.836 0 1.145.808 1.758 1.719 1.758.69 0 1.113-.351 1.261-.742h.059c.031 1.027-.309 1.856-1.133 1.856-.43 0-.715-.227-.773-.45H9.598zm2.757-2.43c0 .637-.43.973-.933.973-.516 0-.934-.34-.934-.98 0-.625.407-1 .926-1 .543 0 .941.375.941 1.008z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-numeric-up-alt" fill="currentColor" id="sort-numeric-up-alt" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 14a.5.5 0 00.5-.5v-11a.5.5 0 00-1 0v11a.5.5 0 00.5.5z"/><path fill-rule="evenodd" d="M6.354 4.854a.5.5 0 000-.708l-2-2a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L4 3.207l1.646 1.647a.5.5 0 00.708 0z"/><path d="M9.598 5.82c.054.621.625 1.278 1.761 1.278 1.422 0 2.145-.98 2.145-2.848 0-2.05-.973-2.688-2.063-2.688-1.125 0-1.972.688-1.972 1.836 0 1.145.808 1.758 1.719 1.758.69 0 1.113-.351 1.261-.742h.059c.031 1.027-.309 1.856-1.133 1.856-.43 0-.715-.227-.773-.45H9.598zm2.757-2.43c0 .637-.43.973-.933.973-.516 0-.934-.34-.934-.98 0-.625.407-1 .926-1 .543 0 .941.375.941 1.008zM12.438 14V8.668H11.39l-1.262.906v.969l1.21-.86h.052V14h1.046z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-up" fill="currentColor" id="sort-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 13a.5.5 0 00.5-.5v-10a.5.5 0 00-1 0v10a.5.5 0 00.5.5z"/><path fill-rule="evenodd" d="M5.354 4.854a.5.5 0 000-.708l-2-2a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L3 3.207l1.646 1.647a.5.5 0 00.708 0zM7 9.5a.5.5 0 01.5-.5h3a.5.5 0 010 1h-3a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm0 9a.5.5 0 01.5-.5h1a.5.5 0 010 1h-1a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sort-up-alt" fill="currentColor" id="sort-up-alt" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 14a.5.5 0 00.5-.5v-10a.5.5 0 00-1 0v10a.5.5 0 00.5.5z"/><path fill-rule="evenodd" d="M5.354 5.854a.5.5 0 000-.708l-2-2a.5.5 0 00-.708 0l-2 2a.5.5 0 10.708.708L3 4.207l1.646 1.647a.5.5 0 00.708 0zM7 6.5a.5.5 0 00.5.5h3a.5.5 0 000-1h-3a.5.5 0 00-.5.5zm0 3a.5.5 0 00.5.5h5a.5.5 0 000-1h-5a.5.5 0 00-.5.5zm0 3a.5.5 0 00.5.5h7a.5.5 0 000-1h-7a.5.5 0 00-.5.5zm0-9a.5.5 0 00.5.5h1a.5.5 0 000-1h-1a.5.5 0 00-.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-soundwave" fill="currentColor" id="soundwave" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.5 2a.5.5 0 01.5.5v11a.5.5 0 01-1 0v-11a.5.5 0 01.5-.5zm-2 2a.5.5 0 01.5.5v7a.5.5 0 01-1 0v-7a.5.5 0 01.5-.5zm4 0a.5.5 0 01.5.5v7a.5.5 0 01-1 0v-7a.5.5 0 01.5-.5zm-6 1.5A.5.5 0 015 6v4a.5.5 0 01-1 0V6a.5.5 0 01.5-.5zm8 0a.5.5 0 01.5.5v4a.5.5 0 01-1 0V6a.5.5 0 01.5-.5zm-10 1A.5.5 0 013 7v2a.5.5 0 01-1 0V7a.5.5 0 01.5-.5zm12 0a.5.5 0 01.5.5v2a.5.5 0 01-1 0V7a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-speaker" fill="currentColor" id="speaker" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1zM4 0a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2H4z"/><path fill-rule="evenodd" d="M8 4.75a.75.75 0 100-1.5.75.75 0 000 1.5zM8 6a2 2 0 100-4 2 2 0 000 4zm0 3a1.5 1.5 0 100 3 1.5 1.5 0 000-3zm-3.5 1.5a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-speaker-fill" fill="currentColor" id="speaker-fill" xmlns="http://www.w3.org/2000/svg"><path d="M9 4a1 1 0 11-2 0 1 1 0 012 0zm-2.5 6.5a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/><path fill-rule="evenodd" d="M4 0a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2H4zm6 4a2 2 0 11-4 0 2 2 0 014 0zM8 7a3.5 3.5 0 100 7 3.5 3.5 0 000-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-spellcheck" fill="currentColor" id="spellcheck" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.217 11.068c1.216 0 1.948-.869 1.948-2.31v-.702c0-1.44-.727-2.305-1.929-2.305-.742 0-1.328.347-1.499.889h-.063V3.983h-1.29V11h1.27v-.791h.064c.21.532.776.86 1.499.86zm-.43-1.025c-.66 0-1.113-.518-1.113-1.28V8.12c0-.825.42-1.343 1.098-1.343.684 0 1.075.518 1.075 1.416v.45c0 .888-.386 1.401-1.06 1.401zm-5.583 1.035c.767 0 1.201-.356 1.406-.737h.059V11h1.216V7.519c0-1.314-.947-1.783-2.11-1.783C1.355 5.736.75 6.42.69 7.27h1.216c.064-.323.313-.552.84-.552.527 0 .864.249.864.771v.464H2.346C1.145 7.953.5 8.568.5 9.496c0 .977.693 1.582 1.704 1.582zm.42-.947c-.44 0-.845-.235-.845-.718 0-.395.269-.684.84-.684h.991v.538c0 .503-.444.864-.986.864zm8.897.567c-.577-.4-.9-1.088-.9-1.983v-.65c0-1.42.894-2.338 2.305-2.338 1.352 0 2.119.82 2.139 1.806h-1.187c-.04-.351-.283-.776-.918-.776-.674 0-1.045.517-1.045 1.328v.625c0 .468.121.834.343 1.067l-.737.92z"/><path fill-rule="evenodd" d="M14.469 9.414a.75.75 0 01.117 1.055l-4 5a.75.75 0 01-1.116.061l-2.5-2.5a.75.75 0 111.06-1.06l1.908 1.907 3.476-4.346a.75.75 0 011.055-.117z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-square" fill="currentColor" id="square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-square-fill" fill="currentColor" id="square-fill" xmlns="http://www.w3.org/2000/svg"><path d="M0 2a2 2 0 012-2h12a2 2 0 012 2v12a2 2 0 01-2 2H2a2 2 0 01-2-2V2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-square-half" fill="currentColor" id="square-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1h6a1 1 0 011 1v12a1 1 0 01-1 1H8V1zm6-1a2 2 0 012 2v12a2 2 0 01-2 2H2a2 2 0 01-2-2V2a2 2 0 012-2h12z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-star" fill="currentColor" id="star" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.866 14.85c-.078.444.36.791.746.593l4.39-2.256 4.389 2.256c.386.198.824-.149.746-.592l-.83-4.73 3.523-3.356c.329-.314.158-.888-.283-.95l-4.898-.696L8.465.792a.513.513 0 00-.927 0L5.354 5.12l-4.898.696c-.441.062-.612.636-.283.95l3.523 3.356-.83 4.73zm4.905-2.767l-3.686 1.894.694-3.957a.565.565 0 00-.163-.505L1.71 6.745l4.052-.576a.525.525 0 00.393-.288l1.847-3.658 1.846 3.658a.525.525 0 00.393.288l4.052.575-2.906 2.77a.564.564 0 00-.163.506l.694 3.957-3.686-1.894a.503.503 0 00-.461 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-star-fill" fill="currentColor" id="star-fill" xmlns="http://www.w3.org/2000/svg"><path d="M3.612 15.443c-.386.198-.824-.149-.746-.592l.83-4.73L.173 6.765c-.329-.314-.158-.888.283-.95l4.898-.696L7.538.792c.197-.39.73-.39.927 0l2.184 4.327 4.898.696c.441.062.612.636.283.95l-3.523 3.356.83 4.73c.078.443-.36.79-.746.592L8 13.187l-4.389 2.256z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-star-half" fill="currentColor" id="star-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.354 5.119L7.538.792A.516.516 0 018 .5c.183 0 .366.097.465.292l2.184 4.327 4.898.696A.537.537 0 0116 6.32a.55.55 0 01-.17.445l-3.523 3.356.83 4.73c.078.443-.36.79-.746.592L8 13.187l-4.389 2.256a.519.519 0 01-.146.05c-.341.06-.668-.254-.6-.642l.83-4.73L.173 6.765a.55.55 0 01-.171-.403.59.59 0 01.084-.302.513.513 0 01.37-.245l4.898-.696zM8 12.027c.08 0 .16.018.232.056l3.686 1.894-.694-3.957a.564.564 0 01.163-.505l2.906-2.77-4.052-.576a.525.525 0 01-.393-.288L8.002 2.223 8 2.226v9.8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-stickies" fill="currentColor" id="stickies" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A1.5 1.5 0 011.5 0H13a1 1 0 011 1H1.5a.5.5 0 00-.5.5V14a1 1 0 01-1-1V1.5z"/><path fill-rule="evenodd" d="M2 3.5A1.5 1.5 0 013.5 2h11A1.5 1.5 0 0116 3.5v6.086a1.5 1.5 0 01-.44 1.06l-4.914 4.915a1.5 1.5 0 01-1.06.439H3.5A1.5 1.5 0 012 14.5v-11zM3.5 3a.5.5 0 00-.5.5v11a.5.5 0 00.5.5h6.086a.5.5 0 00.353-.146l4.915-4.915A.5.5 0 0015 9.586V3.5a.5.5 0 00-.5-.5h-11z"/><path fill-rule="evenodd" d="M10.5 10a.5.5 0 00-.5.5v5H9v-5A1.5 1.5 0 0110.5 9h5v1h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-stickies-fill" fill="currentColor" id="stickies-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1.5A1.5 1.5 0 011.5 0H13a1 1 0 011 1H1.5a.5.5 0 00-.5.5V14a1 1 0 01-1-1V1.5z"/><path fill-rule="evenodd" d="M3.5 2A1.5 1.5 0 002 3.5v11A1.5 1.5 0 003.5 16h6.086a1.5 1.5 0 001.06-.44l4.915-4.914A1.5 1.5 0 0016 9.586V3.5A1.5 1.5 0 0014.5 2h-11zm6 8.5v4.396c0 .223.27.335.427.177l5.146-5.146a.25.25 0 00-.177-.427H10.5a1 1 0 00-1 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sticky" fill="currentColor" id="sticky" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 2.5A1.5 1.5 0 012.5 1h11A1.5 1.5 0 0115 2.5v6.086a1.5 1.5 0 01-.44 1.06l-4.914 4.915a1.5 1.5 0 01-1.06.439H2.5A1.5 1.5 0 011 13.5v-11zM2.5 2a.5.5 0 00-.5.5v11a.5.5 0 00.5.5h6.086a.5.5 0 00.353-.146l4.915-4.915A.5.5 0 0014 8.586V2.5a.5.5 0 00-.5-.5h-11z"/><path fill-rule="evenodd" d="M9.5 9a.5.5 0 00-.5.5v5H8v-5A1.5 1.5 0 019.5 8h5v1h-5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sticky-fill" fill="currentColor" id="sticky-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.5 1A1.5 1.5 0 001 2.5v11A1.5 1.5 0 002.5 15h6.086a1.5 1.5 0 001.06-.44l4.915-4.914A1.5 1.5 0 0015 8.586V2.5A1.5 1.5 0 0013.5 1h-11zm6 8.5v4.396c0 .223.27.335.427.177l5.146-5.146a.25.25 0 00-.177-.427H9.5a1 1 0 00-1 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-stop" fill="currentColor" id="stop" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 5A1.5 1.5 0 015 3.5h6A1.5 1.5 0 0112.5 5v6a1.5 1.5 0 01-1.5 1.5H5A1.5 1.5 0 013.5 11V5zM5 4.5a.5.5 0 00-.5.5v6a.5.5 0 00.5.5h6a.5.5 0 00.5-.5V5a.5.5 0 00-.5-.5H5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-stop-fill" fill="currentColor" id="stop-fill" xmlns="http://www.w3.org/2000/svg"><path d="M5 3.5h6A1.5 1.5 0 0112.5 5v6a1.5 1.5 0 01-1.5 1.5H5A1.5 1.5 0 013.5 11V5A1.5 1.5 0 015 3.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-stoplights" fill="currentColor" id="stoplights" xmlns="http://www.w3.org/2000/svg"><path d="M9.5 3.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm0 4a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm0 4a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/><path fill-rule="evenodd" d="M10 1H6a1 1 0 00-1 1v11a1 1 0 001 1h4a1 1 0 001-1V2a1 1 0 00-1-1zM6 0a2 2 0 00-2 2v11a2 2 0 002 2h4a2 2 0 002-2V2a2 2 0 00-2-2H6z"/><path d="M14 2h-2v2c1.2-.4 1.833-1.5 2-2zM2 2h2v2c-1.2-.4-1.833-1.5-2-2zm12 4h-2v2c1.2-.4 1.833-1.5 2-2zM2 6h2v2c-1.2-.4-1.833-1.5-2-2zm12 4h-2v2c1.2-.4 1.833-1.5 2-2zM2 10h2v2c-1.2-.4-1.833-1.5-2-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-stoplights-fill" fill="currentColor" id="stoplights-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 0a2 2 0 00-2 2v11a2 2 0 002 2h4a2 2 0 002-2V2a2 2 0 00-2-2H6zm3.5 3.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm0 4a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zM8 13a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/><path d="M14 2h-2v2c1.2-.4 1.833-1.5 2-2zM2 2h2v2c-1.2-.4-1.833-1.5-2-2zm12 4h-2v2c1.2-.4 1.833-1.5 2-2zM2 6h2v2c-1.2-.4-1.833-1.5-2-2zm12 4h-2v2c1.2-.4 1.833-1.5 2-2zM2 10h2v2c-1.2-.4-1.833-1.5-2-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-stopwatch" fill="currentColor" id="stopwatch" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 .5a.5.5 0 01.5-.5h3a.5.5 0 010 1H9v1.07A7.001 7.001 0 018 16 7 7 0 017 2.07V1h-.5A.5.5 0 016 .5zM8 3a6 6 0 10.001 12A6 6 0 008 3zm0 2.1a.5.5 0 01.5.5V9a.5.5 0 01-.5.5H4.5a.5.5 0 010-1h3V5.6a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-stopwatch-fill" fill="currentColor" id="stopwatch-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.5 0a.5.5 0 000 1H7v1.07A7.001 7.001 0 008 16 7 7 0 009 2.07V1h.5a.5.5 0 000-1h-3zm2 5.6a.5.5 0 10-1 0v2.9h-3a.5.5 0 000 1H8a.5.5 0 00.5-.5V5.6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-subtract" fill="currentColor" id="subtract" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h8a2 2 0 012 2v2h2a2 2 0 012 2v8a2 2 0 01-2 2H6a2 2 0 01-2-2v-2H2a2 2 0 01-2-2V2zm2-1a1 1 0 00-1 1v8a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1H2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-suit-club" fill="currentColor" id="suit-club" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 1a3.25 3.25 0 00-3.25 3.25c0 .186 0 .29.016.41.014.12.045.27.12.527l.19.665-.692-.028a3.25 3.25 0 102.357 5.334.5.5 0 01.844.518l-.003.005-.006.015-.024.055a21.893 21.893 0 01-.438.92 22.38 22.38 0 01-1.266 2.197c-.013.018-.02.05.001.09.01.02.021.03.03.036A.036.036 0 005.9 15h4.2c.01 0 .016-.002.022-.006a.092.092 0 00.029-.035c.02-.04.014-.073.001-.091a22.875 22.875 0 01-1.704-3.117l-.024-.054-.006-.015-.002-.004a.5.5 0 01.838-.524c.601.7 1.516 1.168 2.496 1.168a3.25 3.25 0 10-.139-6.498l-.699.03.199-.671c.14-.47.14-.745.139-.927V4.25A3.25 3.25 0 008 1zm2.207 12.024c.225.405.487.848.78 1.294C11.437 15 10.975 16 10.1 16H5.9c-.876 0-1.338-1-.887-1.683.291-.442.552-.88.776-1.283a4.25 4.25 0 11-2.007-8.187 2.79 2.79 0 01-.009-.064c-.023-.187-.023-.348-.023-.52V4.25a4.25 4.25 0 018.5 0c0 .14 0 .333-.04.596a4.25 4.25 0 01-.46 8.476 4.186 4.186 0 01-1.543-.298z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-suit-club-fill" fill="currentColor" id="suit-club-fill" xmlns="http://www.w3.org/2000/svg"><path d="M11.5 4.5a3.5 3.5 0 11-7 0 3.5 3.5 0 017 0z"/><path d="M8 9a3.5 3.5 0 11-7 0 3.5 3.5 0 017 0zm7 0a3.5 3.5 0 11-7 0 3.5 3.5 0 017 0z"/><path d="M5.602 14.153c.5-.758 1.224-1.98 1.83-3.498.187-.467.949-.467 1.136 0a19.816 19.816 0 001.83 3.498c.231.35-.02.847-.438.847H6.04c-.419 0-.67-.497-.438-.847z"/><path d="M7 7h2v4H7V7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-suit-diamond" fill="currentColor" id="suit-diamond" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.384 1.226a.463.463 0 00-.768 0l-4.56 6.468a.537.537 0 000 .612l4.56 6.469a.463.463 0 00.768 0l4.56-6.469a.537.537 0 000-.612l-4.56-6.468zM6.848.613a1.39 1.39 0 012.304 0l4.56 6.468a1.61 1.61 0 010 1.838l-4.56 6.468a1.39 1.39 0 01-2.304 0L2.288 8.92a1.61 1.61 0 010-1.838L6.848.613z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-suit-diamond-fill" fill="currentColor" id="suit-diamond-fill" xmlns="http://www.w3.org/2000/svg"><path d="M2.45 7.4L7.2 1.067a1 1 0 011.6 0L13.55 7.4a1 1 0 010 1.2L8.8 14.933a1 1 0 01-1.6 0L2.45 8.6a1 1 0 010-1.2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-suit-heart" fill="currentColor" id="suit-heart" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 6.236l.894-1.789c.222-.443.607-1.08 1.152-1.595C10.582 2.345 11.224 2 12 2c1.676 0 3 1.326 3 2.92 0 1.211-.554 2.066-1.868 3.37-.337.334-.721.695-1.146 1.093C10.878 10.423 9.5 11.717 8 13.447c-1.5-1.73-2.878-3.024-3.986-4.064-.425-.398-.81-.76-1.146-1.093C1.554 6.986 1 6.131 1 4.92 1 3.326 2.324 2 4 2c.776 0 1.418.345 1.954.852.545.515.93 1.152 1.152 1.595L8 6.236zm.392 8.292a.513.513 0 01-.784 0c-1.601-1.902-3.05-3.262-4.243-4.381C1.3 8.208 0 6.989 0 4.92 0 2.755 1.79 1 4 1c1.6 0 2.719 1.05 3.404 2.008.26.365.458.716.596.992a7.55 7.55 0 01.596-.992C9.281 2.049 10.4 1 12 1c2.21 0 4 1.755 4 3.92 0 2.069-1.3 3.288-3.365 5.227-1.193 1.12-2.642 2.48-4.243 4.38z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-suit-heart-fill" fill="currentColor" id="suit-heart-fill" xmlns="http://www.w3.org/2000/svg"><path d="M4 1c2.21 0 4 1.755 4 3.92C8 2.755 9.79 1 12 1s4 1.755 4 3.92c0 3.263-3.234 4.414-7.608 9.608a.513.513 0 01-.784 0C3.234 9.334 0 8.183 0 4.92 0 2.755 1.79 1 4 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-suit-spade" fill="currentColor" id="suit-spade" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 0a.5.5 0 01.429.243c1.359 2.265 2.925 3.682 4.25 4.882.096.086.19.17.282.255C14.308 6.604 15.5 7.747 15.5 9.5a4 4 0 01-5.406 3.746c.235.39.491.782.722 1.131.434.659-.01 1.623-.856 1.623H6.04c-.845 0-1.29-.964-.856-1.623.263-.397.51-.777.728-1.134A4 4 0 01.5 9.5c0-1.753 1.192-2.896 2.539-4.12l.281-.255c1.326-1.2 2.892-2.617 4.251-4.882A.5.5 0 018 0zM3.711 6.12C2.308 7.396 1.5 8.253 1.5 9.5a3 3 0 005.275 1.956.5.5 0 01.868.43c-.094.438-.33.932-.611 1.428a29.247 29.247 0 01-1.013 1.614.03.03 0 00-.005.018.074.074 0 00.024.054h3.924a.074.074 0 00.024-.054.03.03 0 00-.005-.018c-.3-.455-.658-1.005-.96-1.535-.294-.514-.57-1.064-.664-1.507a.5.5 0 01.868-.43A3 3 0 0014.5 9.5c0-1.247-.808-2.104-2.211-3.38L12 5.86c-1.196-1.084-2.668-2.416-4-4.424-1.332 2.008-2.804 3.34-4 4.422l-.289.261z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-suit-spade-fill" fill="currentColor" id="suit-spade-fill" xmlns="http://www.w3.org/2000/svg"><path d="M5.602 14.153C6.272 13.136 7.348 11.28 8 9c.652 2.28 1.727 4.136 2.398 5.153.231.35-.02.847-.438.847H6.04c-.419 0-.67-.497-.438-.847z"/><path d="M4.5 12.5A3.5 3.5 0 008 9a3.5 3.5 0 107 0c0-3-4-4-7-9-3 5-7 6-7 9a3.5 3.5 0 003.5 3.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sun" fill="currentColor" id="sun" xmlns="http://www.w3.org/2000/svg"><path d="M3.5 8a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0z"/><path fill-rule="evenodd" d="M8.202.28a.25.25 0 00-.404 0l-.91 1.255a.25.25 0 01-.334.067L5.232.79a.25.25 0 00-.374.155l-.36 1.508a.25.25 0 01-.282.19l-1.532-.245a.25.25 0 00-.286.286l.244 1.532a.25.25 0 01-.189.282l-1.509.36a.25.25 0 00-.154.374l.812 1.322a.25.25 0 01-.067.333l-1.256.91a.25.25 0 000 .405l1.256.91a.25.25 0 01.067.334L.79 10.768a.25.25 0 00.154.374l1.51.36a.25.25 0 01.188.282l-.244 1.532a.25.25 0 00.286.286l1.532-.244a.25.25 0 01.282.189l.36 1.508a.25.25 0 00.374.155l1.322-.812a.25.25 0 01.333.067l.91 1.256a.25.25 0 00.405 0l.91-1.256a.25.25 0 01.334-.067l1.322.812a.25.25 0 00.374-.155l.36-1.508a.25.25 0 01.282-.19l1.532.245a.25.25 0 00.286-.286l-.244-1.532a.25.25 0 01.189-.282l1.508-.36a.25.25 0 00.155-.374l-.812-1.322a.25.25 0 01.067-.333l1.256-.91a.25.25 0 000-.405l-1.256-.91a.25.25 0 01-.067-.334l.812-1.322a.25.25 0 00-.155-.374l-1.508-.36a.25.25 0 01-.19-.282l.245-1.532a.25.25 0 00-.286-.286l-1.532.244a.25.25 0 01-.282-.189l-.36-1.508a.25.25 0 00-.374-.155l-1.322.812a.25.25 0 01-.333-.067L8.203.28zM8 2.5a5.5 5.5 0 100 11 5.5 5.5 0 000-11z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-sunglasses" fill="currentColor" id="sunglasses" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 5a2 2 0 00-2 2v.5H.5a.5.5 0 000 1H1V9a2 2 0 002 2h1a3 3 0 003-3 1 1 0 112 0 3 3 0 003 3h1a2 2 0 002-2v-.5h.5a.5.5 0 000-1H15V7a2 2 0 00-2-2h-2a2 2 0 00-1.888 1.338A1.99 1.99 0 008 6a1.99 1.99 0 00-1.112.338A2 2 0 005 5H3zm0 1a1 1 0 00-1 1v.941c0 .264.356.348.474.112l.228-.457a2 2 0 01.894-.894l.457-.228C4.289 6.356 4.205 6 3.94 6H3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-table" fill="currentColor" id="table" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h12a2 2 0 012 2v12a2 2 0 01-2 2H2a2 2 0 01-2-2V2zm15 2h-4v3h4V4zm0 4h-4v3h4V8zm0 4h-4v3h3a1 1 0 001-1v-2zm-5 3v-3H6v3h4zm-5 0v-3H1v2a1 1 0 001 1h3zm-4-4h4V8H1v3zm0-4h4V4H1v3zm5-3v3h4V4H6zm4 4H6v3h4V8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tablet" fill="currentColor" id="tablet" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12 1H4a1 1 0 00-1 1v12a1 1 0 001 1h8a1 1 0 001-1V2a1 1 0 00-1-1zM4 0a2 2 0 00-2 2v12a2 2 0 002 2h8a2 2 0 002-2V2a2 2 0 00-2-2H4z"/><path fill-rule="evenodd" d="M8 14a1 1 0 100-2 1 1 0 000 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tablet-fill" fill="currentColor" id="tablet-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2a2 2 0 012-2h8a2 2 0 012 2v12a2 2 0 01-2 2H4a2 2 0 01-2-2V2zm7 11a1 1 0 11-2 0 1 1 0 012 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tablet-landscape" fill="currentColor" id="tablet-landscape" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 4v8a1 1 0 001 1h12a1 1 0 001-1V4a1 1 0 00-1-1H2a1 1 0 00-1 1zm-1 8a2 2 0 002 2h12a2 2 0 002-2V4a2 2 0 00-2-2H2a2 2 0 00-2 2v8z"/><path fill-rule="evenodd" d="M14 8a1 1 0 10-2 0 1 1 0 002 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tablet-landscape-fill" fill="currentColor" id="tablet-landscape-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 14a2 2 0 01-2-2V4a2 2 0 012-2h12a2 2 0 012 2v8a2 2 0 01-2 2H2zm11-7a1 1 0 110 2 1 1 0 010-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tag" fill="currentColor" id="tag" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 2v4.586l7 7L13.586 9l-7-7H2zM1 2a1 1 0 011-1h4.586a1 1 0 01.707.293l7 7a1 1 0 010 1.414l-4.586 4.586a1 1 0 01-1.414 0l-7-7A1 1 0 011 6.586V2z"/><path fill-rule="evenodd" d="M4.5 5a.5.5 0 100-1 .5.5 0 000 1zm0 1a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tag-fill" fill="currentColor" id="tag-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 1a1 1 0 00-1 1v4.586a1 1 0 00.293.707l7 7a1 1 0 001.414 0l4.586-4.586a1 1 0 000-1.414l-7-7A1 1 0 006.586 1H2zm4 3.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tags" fill="currentColor" id="tags" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 2v4.586l7 7L14.586 9l-7-7H3zM2 2a1 1 0 011-1h4.586a1 1 0 01.707.293l7 7a1 1 0 010 1.414l-4.586 4.586a1 1 0 01-1.414 0l-7-7A1 1 0 012 6.586V2z"/><path fill-rule="evenodd" d="M5.5 5a.5.5 0 100-1 .5.5 0 000 1zm0 1a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/><path d="M1 7.086a1 1 0 00.293.707L8.75 15.25l-.043.043a1 1 0 01-1.414 0l-7-7A1 1 0 010 7.586V3a1 1 0 011-1v5.086z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tags-fill" fill="currentColor" id="tags-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 1a1 1 0 00-1 1v4.586a1 1 0 00.293.707l7 7a1 1 0 001.414 0l4.586-4.586a1 1 0 000-1.414l-7-7A1 1 0 007.586 1H3zm4 3.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/><path d="M1 7.086a1 1 0 00.293.707L8.75 15.25l-.043.043a1 1 0 01-1.414 0l-7-7A1 1 0 010 7.586V3a1 1 0 011-1v5.086z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone" fill="currentColor" id="telephone" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.654 1.328a.678.678 0 00-1.015-.063L1.605 2.3c-.483.484-.661 1.169-.45 1.77a17.568 17.568 0 004.168 6.608 17.569 17.569 0 006.608 4.168c.601.211 1.286.033 1.77-.45l1.034-1.034a.678.678 0 00-.063-1.015l-2.307-1.794a.678.678 0 00-.58-.122l-2.19.547a1.745 1.745 0 01-1.657-.459L5.482 8.062a1.745 1.745 0 01-.46-1.657l.548-2.19a.678.678 0 00-.122-.58L3.654 1.328zM1.884.511a1.745 1.745 0 012.612.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-fill" fill="currentColor" id="telephone-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.267.98a1.636 1.636 0 012.448.152l1.681 2.162c.309.396.418.913.296 1.4l-.513 2.053a.636.636 0 00.167.604L8.65 9.654a.636.636 0 00.604.167l2.052-.513a1.636 1.636 0 011.401.296l2.162 1.681c.777.604.849 1.753.153 2.448l-.97.97c-.693.693-1.73.998-2.697.658a17.47 17.47 0 01-6.571-4.144A17.47 17.47 0 01.639 4.646c-.34-.967-.035-2.004.658-2.698l.97-.969z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-forward" fill="currentColor" id="telephone-forward" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.654 1.328a.678.678 0 00-1.015-.063L1.605 2.3c-.483.484-.661 1.169-.45 1.77a17.568 17.568 0 004.168 6.608 17.569 17.569 0 006.608 4.168c.601.211 1.286.033 1.77-.45l1.034-1.034a.678.678 0 00-.063-1.015l-2.307-1.794a.678.678 0 00-.58-.122l-2.19.547a1.745 1.745 0 01-1.657-.459L5.482 8.062a1.745 1.745 0 01-.46-1.657l.548-2.19a.678.678 0 00-.122-.58L3.654 1.328zM1.884.511a1.745 1.745 0 012.612.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511zm10.762.135a.5.5 0 01.708 0l2.5 2.5a.5.5 0 010 .708l-2.5 2.5a.5.5 0 01-.708-.708L14.293 4H9.5a.5.5 0 010-1h4.793l-1.647-1.646a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-forward-fill" fill="currentColor" id="telephone-forward-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.885.511a1.745 1.745 0 012.61.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511zm10.761.135a.5.5 0 01.708 0l2.5 2.5a.5.5 0 010 .708l-2.5 2.5a.5.5 0 01-.708-.708L14.293 4H9.5a.5.5 0 010-1h4.793l-1.647-1.646a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-inbound" fill="currentColor" id="telephone-inbound" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M15.854.146a.5.5 0 010 .708L11.707 5H14.5a.5.5 0 010 1h-4a.5.5 0 01-.5-.5v-4a.5.5 0 011 0v2.793L15.146.146a.5.5 0 01.708 0zm-12.2 1.182a.678.678 0 00-1.015-.063L1.605 2.3c-.483.484-.661 1.169-.45 1.77a17.568 17.568 0 004.168 6.608 17.569 17.569 0 006.608 4.168c.601.211 1.286.033 1.77-.45l1.034-1.034a.678.678 0 00-.063-1.015l-2.307-1.794a.678.678 0 00-.58-.122l-2.19.547a1.745 1.745 0 01-1.657-.459L5.482 8.062a1.745 1.745 0 01-.46-1.657l.548-2.19a.678.678 0 00-.122-.58L3.654 1.328zM1.884.511a1.745 1.745 0 012.612.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-inbound-fill" fill="currentColor" id="telephone-inbound-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.885.511a1.745 1.745 0 012.61.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511zM15.854.146a.5.5 0 010 .708L11.707 5H14.5a.5.5 0 010 1h-4a.5.5 0 01-.5-.5v-4a.5.5 0 011 0v2.793L15.146.146a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-minus" fill="currentColor" id="telephone-minus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.654 1.328a.678.678 0 00-1.015-.063L1.605 2.3c-.483.484-.661 1.169-.45 1.77a17.568 17.568 0 004.168 6.608 17.569 17.569 0 006.608 4.168c.601.211 1.286.033 1.77-.45l1.034-1.034a.678.678 0 00-.063-1.015l-2.307-1.794a.678.678 0 00-.58-.122l-2.19.547a1.745 1.745 0 01-1.657-.459L5.482 8.062a1.745 1.745 0 01-.46-1.657l.548-2.19a.678.678 0 00-.122-.58L3.654 1.328zM1.884.511a1.745 1.745 0 012.612.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511zM10 3.5a.5.5 0 01.5-.5h4a.5.5 0 010 1h-4a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-minus-fill" fill="currentColor" id="telephone-minus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.885.511a1.745 1.745 0 012.61.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511zM10 3.5a.5.5 0 01.5-.5h4a.5.5 0 010 1h-4a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-outbound" fill="currentColor" id="telephone-outbound" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.654 1.328a.678.678 0 00-1.015-.063L1.605 2.3c-.483.484-.661 1.169-.45 1.77a17.568 17.568 0 004.168 6.608 17.569 17.569 0 006.608 4.168c.601.211 1.286.033 1.77-.45l1.034-1.034a.678.678 0 00-.063-1.015l-2.307-1.794a.678.678 0 00-.58-.122l-2.19.547a1.745 1.745 0 01-1.657-.459L5.482 8.062a1.745 1.745 0 01-.46-1.657l.548-2.19a.678.678 0 00-.122-.58L3.654 1.328zM1.884.511a1.745 1.745 0 012.612.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511zM11 .5a.5.5 0 01.5-.5h4a.5.5 0 01.5.5v4a.5.5 0 01-1 0V1.707l-4.146 4.147a.5.5 0 01-.708-.708L14.293 1H11.5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-outbound-fill" fill="currentColor" id="telephone-outbound-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.885.511a1.745 1.745 0 012.61.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511zM11 .5a.5.5 0 01.5-.5h4a.5.5 0 01.5.5v4a.5.5 0 01-1 0V1.707l-4.146 4.147a.5.5 0 01-.708-.708L14.293 1H11.5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-plus" fill="currentColor" id="telephone-plus" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.654 1.328a.678.678 0 00-1.015-.063L1.605 2.3c-.483.484-.661 1.169-.45 1.77a17.568 17.568 0 004.168 6.608 17.569 17.569 0 006.608 4.168c.601.211 1.286.033 1.77-.45l1.034-1.034a.678.678 0 00-.063-1.015l-2.307-1.794a.678.678 0 00-.58-.122l-2.19.547a1.745 1.745 0 01-1.657-.459L5.482 8.062a1.745 1.745 0 01-.46-1.657l.548-2.19a.678.678 0 00-.122-.58L3.654 1.328zM1.884.511a1.745 1.745 0 012.612.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511zM12.5 1a.5.5 0 01.5.5V3h1.5a.5.5 0 010 1H13v1.5a.5.5 0 01-1 0V4h-1.5a.5.5 0 010-1H12V1.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-plus-fill" fill="currentColor" id="telephone-plus-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.885.511a1.745 1.745 0 012.61.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511zM12.5 1a.5.5 0 01.5.5V3h1.5a.5.5 0 010 1H13v1.5a.5.5 0 01-1 0V4h-1.5a.5.5 0 010-1H12V1.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-x" fill="currentColor" id="telephone-x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.654 1.328a.678.678 0 00-1.015-.063L1.605 2.3c-.483.484-.661 1.169-.45 1.77a17.568 17.568 0 004.168 6.608 17.569 17.569 0 006.608 4.168c.601.211 1.286.033 1.77-.45l1.034-1.034a.678.678 0 00-.063-1.015l-2.307-1.794a.678.678 0 00-.58-.122l-2.19.547a1.745 1.745 0 01-1.657-.459L5.482 8.062a1.745 1.745 0 01-.46-1.657l.548-2.19a.678.678 0 00-.122-.58L3.654 1.328zM1.884.511a1.745 1.745 0 012.612.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511zm9.262 1.135a.5.5 0 01.708 0L13 2.793l1.146-1.147a.5.5 0 01.708.708L13.707 3.5l1.147 1.146a.5.5 0 01-.708.708L13 4.207l-1.146 1.147a.5.5 0 01-.708-.708L12.293 3.5l-1.147-1.146a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-telephone-x-fill" fill="currentColor" id="telephone-x-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.885.511a1.745 1.745 0 012.61.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 00.178.643l2.457 2.457a.678.678 0 00.644.178l2.189-.547a1.745 1.745 0 011.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 01-7.01-4.42 18.634 18.634 0 01-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511zm9.261 1.135a.5.5 0 01.708 0L13 2.793l1.146-1.147a.5.5 0 01.708.708L13.707 3.5l1.147 1.146a.5.5 0 01-.708.708L13 4.207l-1.146 1.147a.5.5 0 01-.708-.708L12.293 3.5l-1.147-1.146a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-terminal" fill="currentColor" id="terminal" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 2H2a1 1 0 00-1 1v10a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1zM2 1a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V3a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M6 9a.5.5 0 01.5-.5h3a.5.5 0 010 1h-3A.5.5 0 016 9zM3.146 4.146a.5.5 0 01.708 0l2 2a.5.5 0 010 .708l-2 2a.5.5 0 11-.708-.708L4.793 6.5 3.146 4.854a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-terminal-fill" fill="currentColor" id="terminal-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 3a2 2 0 012-2h12a2 2 0 012 2v10a2 2 0 01-2 2H2a2 2 0 01-2-2V3zm9.5 5.5h-3a.5.5 0 000 1h3a.5.5 0 000-1zm-6.354-.354L4.793 6.5 3.146 4.854a.5.5 0 11.708-.708l2 2a.5.5 0 010 .708l-2 2a.5.5 0 01-.708-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-text-center" fill="currentColor" id="text-center" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 12.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm-2-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm2-3a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm-2-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-text-indent-left" fill="currentColor" id="text-indent-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 3.5a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm.646 2.146a.5.5 0 01.708 0l2 2a.5.5 0 010 .708l-2 2a.5.5 0 01-.708-.708L4.293 8 2.646 6.354a.5.5 0 010-.708zM7 6.5a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm-5 3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-text-indent-right" fill="currentColor" id="text-indent-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 3.5a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm10.646 2.146a.5.5 0 01.708.708L11.707 8l1.647 1.646a.5.5 0 01-.708.708l-2-2a.5.5 0 010-.708l2-2zM2 6.5a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5zm0 3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-text-left" fill="currentColor" id="text-left" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 12.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-text-paragraph" fill="currentColor" id="text-paragraph" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 12.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm0-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm4-3a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-text-right" fill="currentColor" id="text-right" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 12.5a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm-4-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5zm4-3a.5.5 0 01.5-.5h7a.5.5 0 010 1h-7a.5.5 0 01-.5-.5zm-4-3a.5.5 0 01.5-.5h11a.5.5 0 010 1h-11a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-textarea" fill="currentColor" id="textarea" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 2.5A1.5 1.5 0 013 1h10a1.5 1.5 0 011.5 1.5v3.563a2 2 0 010 3.874V13.5A1.5 1.5 0 0113 15H3a1.5 1.5 0 01-1.5-1.5V9.937a2 2 0 010-3.874V2.5zm1 3.563a2 2 0 010 3.874V13.5a.5.5 0 00.5.5h10a.5.5 0 00.5-.5V9.937a2 2 0 010-3.874V2.5A.5.5 0 0013 2H3a.5.5 0 00-.5.5v3.563zM2 7a1 1 0 100 2 1 1 0 000-2zm12 0a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-textarea-resize" fill="currentColor" id="textarea-resize" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 3.5A2.5 2.5 0 012.5 1h11A2.5 2.5 0 0116 3.5v8.854a2.5 2.5 0 01-2.5 2.5h-11a2.5 2.5 0 01-2.5-2.5V3.5zM2.5 2A1.5 1.5 0 001 3.5v8.854a1.5 1.5 0 001.5 1.5h11a1.5 1.5 0 001.5-1.5V3.5A1.5 1.5 0 0013.5 2h-11zm10.854 6.5a.5.5 0 010 .707l-3 3a.5.5 0 11-.708-.707l3-3a.5.5 0 01.708 0zm0 2.5a.5.5 0 010 .707l-.5.5a.5.5 0 01-.708-.707l.5-.5a.5.5 0 01.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-textarea-t" fill="currentColor" id="textarea-t" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 2.5A1.5 1.5 0 013 1h10a1.5 1.5 0 011.5 1.5v3.563a2 2 0 010 3.874V13.5A1.5 1.5 0 0113 15H3a1.5 1.5 0 01-1.5-1.5V9.937a2 2 0 010-3.874V2.5zm1 3.563a2 2 0 010 3.874V13.5a.5.5 0 00.5.5h10a.5.5 0 00.5-.5V9.937a2 2 0 010-3.874V2.5A.5.5 0 0013 2H3a.5.5 0 00-.5.5v3.563zM2 7a1 1 0 100 2 1 1 0 000-2zm12 0a1 1 0 100 2 1 1 0 000-2z"/><path d="M11.434 4H4.566L4.5 5.994h.386c.21-1.252.612-1.446 2.173-1.495l.343-.011v6.343c0 .537-.116.665-1.049.748V12h3.294v-.421c-.938-.083-1.054-.21-1.054-.748V4.488l.348.01c1.56.05 1.963.244 2.173 1.496h.386L11.434 4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-thermometer" fill="currentColor" id="thermometer" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 2a2 2 0 114 0v7.627a3.5 3.5 0 11-4 0V2zm2-1a1 1 0 00-1 1v7.901a.5.5 0 01-.25.433A2.499 2.499 0 008 15a2.5 2.5 0 001.25-4.666.5.5 0 01-.25-.433V2a1 1 0 00-1-1z"/><path d="M9.5 12.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-thermometer-half" fill="currentColor" id="thermometer-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6 2a2 2 0 114 0v7.627a3.5 3.5 0 11-4 0V2zm2-1a1 1 0 00-1 1v7.901a.5.5 0 01-.25.433A2.499 2.499 0 008 15a2.5 2.5 0 001.25-4.666.5.5 0 01-.25-.433V2a1 1 0 00-1-1z"/><path d="M8.25 2a.25.25 0 00-.5 0v9.02a1.514 1.514 0 01.5 0V2z"/><path d="M9.5 12.5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-three-dots" fill="currentColor" id="three-dots" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 9.5a1.5 1.5 0 110-3 1.5 1.5 0 010 3zm5 0a1.5 1.5 0 110-3 1.5 1.5 0 010 3zm5 0a1.5 1.5 0 110-3 1.5 1.5 0 010 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-three-dots-vertical" fill="currentColor" id="three-dots-vertical" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.5 13a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm0-5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0zm0-5a1.5 1.5 0 11-3 0 1.5 1.5 0 013 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-toggle-off" fill="currentColor" id="toggle-off" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11 4a4 4 0 010 8H8a4.992 4.992 0 002-4 4.992 4.992 0 00-2-4h3zm-6 8a4 4 0 110-8 4 4 0 010 8zM0 8a5 5 0 005 5h6a5 5 0 000-10H5a5 5 0 00-5 5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-toggle-on" fill="currentColor" id="toggle-on" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 3a5 5 0 000 10h6a5 5 0 000-10H5zm6 9a4 4 0 100-8 4 4 0 000 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-toggle2-off" fill="currentColor" id="toggle2-off" xmlns="http://www.w3.org/2000/svg"><path d="M9 11c.628-.836 1-1.874 1-3a4.978 4.978 0 00-1-3h4a3 3 0 110 6H9z"/><path fill-rule="evenodd" d="M5 12a4 4 0 100-8 4 4 0 000 8zm0 1A5 5 0 105 3a5 5 0 000 10z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-toggle2-on" fill="currentColor" id="toggle2-on" xmlns="http://www.w3.org/2000/svg"><path d="M7 5H3a3 3 0 000 6h4a4.995 4.995 0 01-.584-1H3a2 2 0 110-4h3.416c.156-.357.352-.692.584-1z"/><path d="M16 8A5 5 0 116 8a5 5 0 0110 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-toggles" fill="currentColor" id="toggles" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.5 9a3.5 3.5 0 100 7h7a3.5 3.5 0 100-7h-7zm7 6a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm-7-14a2.5 2.5 0 100 5 2.5 2.5 0 000-5zm2.45 0A3.49 3.49 0 018 3.5 3.49 3.49 0 016.95 6h4.55a2.5 2.5 0 000-5H6.95zM4.5 0h7a3.5 3.5 0 110 7h-7a3.5 3.5 0 110-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-toggles2" fill="currentColor" id="toggles2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 4a2 2 0 012-2h8a2 2 0 110 4H4a2 2 0 01-2-2zm2-1a1 1 0 000 2h8a1 1 0 100-2H4z"/><path d="M14 4a4 4 0 11-8 0 4 4 0 018 0z"/><path fill-rule="evenodd" d="M9.465 10H12a2 2 0 110 4H9.465c.34-.588.535-1.271.535-2 0-.729-.195-1.412-.535-2z"/><path fill-rule="evenodd" d="M6 15a3 3 0 110-6 3 3 0 010 6zm0 1a4 4 0 110-8 4 4 0 010 8z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tools" fill="currentColor" id="tools" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 1l1-1 3.081 2.2a1 1 0 01.419.815v.07a1 1 0 00.293.708L10.5 9.5l.914-.305a1 1 0 011.023.242l3.356 3.356a1 1 0 010 1.414l-1.586 1.586a1 1 0 01-1.414 0l-3.356-3.356a1 1 0 01-.242-1.023L9.5 10.5 3.793 4.793a1 1 0 00-.707-.293h-.071a1 1 0 01-.814-.419L0 1zm11.354 9.646a.5.5 0 00-.708.708l3 3a.5.5 0 00.708-.708l-3-3z"/><path fill-rule="evenodd" d="M15.898 2.223a3.003 3.003 0 01-3.679 3.674L5.878 12.15a3 3 0 11-2.027-2.027l6.252-6.341A3 3 0 0113.778.1l-2.142 2.142L12 4l1.757.364 2.141-2.141zm-13.37 9.019L3.001 11l.471.242.529.026.287.445.445.287.026.529L5 13l-.242.471-.026.529-.445.287-.287.445-.529.026L3 15l-.471-.242L2 14.732l-.287-.445L1.268 14l-.026-.529L1 13l.242-.471.026-.529.445-.287.287-.445.529-.026z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-trash" fill="currentColor" id="trash" xmlns="http://www.w3.org/2000/svg"><path d="M5.5 5.5A.5.5 0 016 6v6a.5.5 0 01-1 0V6a.5.5 0 01.5-.5zm2.5 0a.5.5 0 01.5.5v6a.5.5 0 01-1 0V6a.5.5 0 01.5-.5zm3 .5a.5.5 0 00-1 0v6a.5.5 0 001 0V6z"/><path fill-rule="evenodd" d="M14.5 3a1 1 0 01-1 1H13v9a2 2 0 01-2 2H5a2 2 0 01-2-2V4h-.5a1 1 0 01-1-1V2a1 1 0 011-1H6a1 1 0 011-1h2a1 1 0 011 1h3.5a1 1 0 011 1v1zM4.118 4L4 4.059V13a1 1 0 001 1h6a1 1 0 001-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-trash-fill" fill="currentColor" id="trash-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.5 1a1 1 0 00-1 1v1a1 1 0 001 1H3v9a2 2 0 002 2h6a2 2 0 002-2V4h.5a1 1 0 001-1V2a1 1 0 00-1-1H10a1 1 0 00-1-1H7a1 1 0 00-1 1H2.5zm3 4a.5.5 0 01.5.5v7a.5.5 0 01-1 0v-7a.5.5 0 01.5-.5zM8 5a.5.5 0 01.5.5v7a.5.5 0 01-1 0v-7A.5.5 0 018 5zm3 .5a.5.5 0 00-1 0v7a.5.5 0 001 0v-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-trash2" fill="currentColor" id="trash2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.18 4l1.528 9.164a1 1 0 00.986.836h4.612a1 1 0 00.986-.836L12.82 4H3.18zm.541 9.329A2 2 0 005.694 15h4.612a2 2 0 001.973-1.671L14 3H2l1.721 10.329z"/><path d="M14 3c0 1.105-2.686 2-6 2s-6-.895-6-2 2.686-2 6-2 6 .895 6 2z"/><path fill-rule="evenodd" d="M12.9 3c-.18-.14-.497-.307-.974-.466C10.967 2.214 9.58 2 8 2s-2.968.215-3.926.534c-.477.16-.795.327-.975.466.18.14.498.307.975.466C5.032 3.786 6.42 4 8 4s2.967-.215 3.926-.534c.477-.16.795-.327.975-.466zM8 5c3.314 0 6-.895 6-2s-2.686-2-6-2-6 .895-6 2 2.686 2 6 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-trash2-fill" fill="currentColor" id="trash2-fill" xmlns="http://www.w3.org/2000/svg"><path d="M2.037 3.225l1.684 10.104A2 2 0 005.694 15h4.612a2 2 0 001.973-1.671l1.684-10.104C13.627 4.224 11.085 5 8 5c-3.086 0-5.627-.776-5.963-1.775z"/><path fill-rule="evenodd" d="M12.9 3c-.18-.14-.497-.307-.974-.466C10.967 2.214 9.58 2 8 2s-2.968.215-3.926.534c-.477.16-.795.327-.975.466.18.14.498.307.975.466C5.032 3.786 6.42 4 8 4s2.967-.215 3.926-.534c.477-.16.795-.327.975-.466zM8 5c3.314 0 6-.895 6-2s-2.686-2-6-2-6 .895-6 2 2.686 2 6 2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tree" fill="currentColor" id="tree" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 0a.5.5 0 01.416.223l3 4.5A.5.5 0 0111 5.5h-.098l2.022 3.235a.5.5 0 01-.424.765h-.191l1.638 3.276a.5.5 0 01-.447.724h-11a.5.5 0 01-.447-.724L3.69 9.5H3.5a.5.5 0 01-.424-.765L5.098 5.5H5a.5.5 0 01-.416-.777l3-4.5A.5.5 0 018 0zM5.934 4.5H6a.5.5 0 01.424.765L4.402 8.5H4.5a.5.5 0 01.447.724L3.31 12.5h9.382l-1.638-3.276A.5.5 0 0111.5 8.5h.098L9.576 5.265A.5.5 0 0110 4.5h.066L8 1.401 5.934 4.5z"/><path d="M7 13.5h2V16H7v-2.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tree-fill" fill="currentColor" id="tree-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 0a.5.5 0 01.416.223l3 4.5A.5.5 0 0111 5.5h-.098l2.022 3.235a.5.5 0 01-.424.765h-.191l1.638 3.276a.5.5 0 01-.447.724h-11a.5.5 0 01-.447-.724L3.69 9.5H3.5a.5.5 0 01-.424-.765L5.098 5.5H5a.5.5 0 01-.416-.777l3-4.5A.5.5 0 018 0z"/><path d="M7 13.5h2V16H7v-2.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-triangle" fill="currentColor" id="triangle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.938 2.016a.146.146 0 00-.054.057L1.027 13.74a.176.176 0 00-.002.183c.016.03.037.05.054.06.015.01.034.017.066.017h13.713a.12.12 0 00.066-.017.163.163 0 00.055-.06.176.176 0 00-.003-.183L8.12 2.073a.146.146 0 00-.054-.057A.13.13 0 008.002 2a.13.13 0 00-.064.016zm1.044-.45a1.13 1.13 0 00-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-triangle-fill" fill="currentColor" id="triangle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.022 1.566a1.13 1.13 0 011.96 0l6.857 11.667c.457.778-.092 1.767-.98 1.767H1.144c-.889 0-1.437-.99-.98-1.767L7.022 1.566z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-triangle-half" fill="currentColor" id="triangle-half" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.065 2.016a.146.146 0 01.054.057l6.857 11.667c.036.06.035.124.002.183a.162.162 0 01-.054.06.115.115 0 01-.066.017l-6.856-.017V2a.13.13 0 01.063.016zm-1.043-.45a1.13 1.13 0 011.96 0l6.857 11.667c.457.778-.092 1.767-.98 1.767H1.144c-.889 0-1.437-.99-.98-1.767L7.022 1.566z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-trophy" fill="currentColor" id="trophy" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.5.5A.5.5 0 013 0h10a.5.5 0 01.5.5c0 .538-.012 1.05-.034 1.536a3 3 0 11-1.133 5.89c-.79 1.865-1.878 2.777-2.833 3.011v2.173l1.425.356c.194.048.377.135.537.255L13.3 15.1a.5.5 0 01-.3.9H3a.5.5 0 01-.3-.9l1.838-1.379c.16-.12.343-.207.537-.255L6.5 13.11v-2.173c-.955-.234-2.043-1.146-2.833-3.012a3 3 0 11-1.132-5.89A33.076 33.076 0 012.5.5zm.099 2.54a2 2 0 00.72 3.935c-.333-1.05-.588-2.346-.72-3.935zm10.083 3.935a2 2 0 00.72-3.935c-.133 1.59-.388 2.885-.72 3.935zM3.504 1c.007.517.026 1.006.056 1.469.13 2.028.457 3.546.87 4.667C5.294 9.48 6.484 10 7 10a.5.5 0 01.5.5v2.61a1 1 0 01-.757.97l-1.426.356a.5.5 0 00-.179.085L4.5 15h7l-.638-.479a.501.501 0 00-.18-.085l-1.425-.356a1 1 0 01-.757-.97V10.5A.5.5 0 019 10c.516 0 1.706-.52 2.57-2.864.413-1.12.74-2.64.87-4.667.03-.463.049-.952.056-1.469H3.504z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-trophy-fill" fill="currentColor" id="trophy-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.5.5A.5.5 0 013 0h10a.5.5 0 01.5.5c0 .538-.012 1.05-.034 1.536a3 3 0 11-1.133 5.89c-.79 1.865-1.878 2.777-2.833 3.011v2.173l1.425.356c.194.048.377.135.537.255L13.3 15.1a.5.5 0 01-.3.9H3a.5.5 0 01-.3-.9l1.838-1.379c.16-.12.343-.207.537-.255L6.5 13.11v-2.173c-.955-.234-2.043-1.146-2.833-3.012a3 3 0 11-1.132-5.89A33.076 33.076 0 012.5.5zm.099 2.54a2 2 0 00.72 3.935c-.333-1.05-.588-2.346-.72-3.935zm10.083 3.935a2 2 0 00.72-3.935c-.133 1.59-.388 2.885-.72 3.935z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-truck" fill="currentColor" id="truck" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 3.5A1.5 1.5 0 011.5 2h9A1.5 1.5 0 0112 3.5V5h1.02a1.5 1.5 0 011.17.563l1.481 1.85a1.5 1.5 0 01.329.938V10.5a1.5 1.5 0 01-1.5 1.5H14a2 2 0 11-4 0H5a2 2 0 11-3.998-.085A1.5 1.5 0 010 10.5v-7zm1.294 7.456A1.999 1.999 0 014.732 11h5.536a2.01 2.01 0 01.732-.732V3.5a.5.5 0 00-.5-.5h-9a.5.5 0 00-.5.5v7a.5.5 0 00.294.456zM12 10a2 2 0 011.732 1h.768a.5.5 0 00.5-.5V8.35a.5.5 0 00-.11-.312l-1.48-1.85A.5.5 0 0013.02 6H12v4zm-9 1a1 1 0 100 2 1 1 0 000-2zm9 0a1 1 0 100 2 1 1 0 000-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-truck-flatbed" fill="currentColor" id="truck-flatbed" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.5 4a.5.5 0 01.5.5V5h1.02a1.5 1.5 0 011.17.563l1.481 1.85a1.5 1.5 0 01.329.938V10.5a1.5 1.5 0 01-1.5 1.5H14a2 2 0 11-4 0H5a2 2 0 11-4 0 1 1 0 01-1-1v-1h11V4.5a.5.5 0 01.5-.5zM3 11a1 1 0 100 2 1 1 0 000-2zm9 0a1 1 0 100 2 1 1 0 000-2zm1.732 0A2 2 0 0012 10V6h1.02a.5.5 0 01.39.188l1.48 1.85a.5.5 0 01.11.313V10.5a.5.5 0 01-.5.5h-.768z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tv" fill="currentColor" id="tv" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.5 13.5A.5.5 0 013 13h10a.5.5 0 010 1H3a.5.5 0 01-.5-.5zM13.991 3H2c-.325 0-.502.078-.602.145a.758.758 0 00-.254.302A1.46 1.46 0 001 4.01V10c0 .325.078.502.145.602.07.105.17.188.302.254a1.464 1.464 0 00.538.143L2.01 11H14c.325 0 .502-.078.602-.145a.758.758 0 00.254-.302 1.464 1.464 0 00.143-.538L15 9.99V4c0-.325-.078-.502-.145-.602a.757.757 0 00-.302-.254A1.46 1.46 0 0013.99 3zM14 2H2C0 2 0 4 0 4v6c0 2 2 2 2 2h12c2 0 2-2 2-2V4c0-2-2-2-2-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-tv-fill" fill="currentColor" id="tv-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2.5 13.5A.5.5 0 013 13h10a.5.5 0 010 1H3a.5.5 0 01-.5-.5zM2 2h12s2 0 2 2v6s0 2-2 2H2s-2 0-2-2V4s0-2 2-2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-type" fill="currentColor" id="type" xmlns="http://www.w3.org/2000/svg"><path d="M2.244 13.081l.943-2.803H6.66l.944 2.803H8.86L5.54 3.75H4.322L1 13.081h1.244zm2.7-7.923L6.34 9.314H3.51l1.4-4.156h.034zm9.146 7.027h.035v.896h1.128V8.125c0-1.51-1.114-2.345-2.646-2.345-1.736 0-2.59.916-2.666 2.174h1.108c.068-.718.595-1.19 1.517-1.19.971 0 1.518.52 1.518 1.464v.731H12.19c-1.647.007-2.522.8-2.522 2.058 0 1.319.957 2.18 2.345 2.18 1.06 0 1.716-.43 2.078-1.011zm-1.763.035c-.752 0-1.456-.397-1.456-1.244 0-.65.424-1.115 1.408-1.115h1.805v.834c0 .896-.752 1.525-1.757 1.525z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-type-bold" fill="currentColor" id="type-bold" xmlns="http://www.w3.org/2000/svg"><path d="M8.21 13c2.106 0 3.412-1.087 3.412-2.823 0-1.306-.984-2.283-2.324-2.386v-.055a2.176 2.176 0 001.852-2.14c0-1.51-1.162-2.46-3.014-2.46H3.843V13H8.21zM5.908 4.674h1.696c.963 0 1.517.451 1.517 1.244 0 .834-.629 1.32-1.73 1.32H5.908V4.673zm0 6.788V8.598h1.73c1.217 0 1.88.492 1.88 1.415 0 .943-.643 1.449-1.832 1.449H5.907z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-type-h1" fill="currentColor" id="type-h1" xmlns="http://www.w3.org/2000/svg"><path d="M8.637 13V3.669H7.379V7.62H2.758V3.67H1.5V13h1.258V8.728h4.62V13h1.259zm5.329 0V3.669h-1.244L10.5 5.316v1.265l2.16-1.565h.062V13h1.244z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-type-h2" fill="currentColor" id="type-h2" xmlns="http://www.w3.org/2000/svg"><path d="M7.638 13V3.669H6.38V7.62H1.759V3.67H.5V13h1.258V8.728h4.62V13h1.259zm3.022-6.733v-.048c0-.889.63-1.668 1.716-1.668.957 0 1.675.608 1.675 1.572 0 .855-.554 1.504-1.067 2.085l-3.513 3.999V13H15.5v-1.094h-4.245v-.075l2.481-2.844c.875-.998 1.586-1.784 1.586-2.953 0-1.463-1.155-2.556-2.919-2.556-1.941 0-2.966 1.326-2.966 2.74v.049h1.223z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-type-h3" fill="currentColor" id="type-h3" xmlns="http://www.w3.org/2000/svg"><path d="M7.637 13V3.669H6.379V7.62H1.758V3.67H.5V13h1.258V8.728h4.62V13h1.259zm3.625-4.272h1.018c1.142 0 1.935.67 1.949 1.674.013 1.005-.78 1.737-2.01 1.73-1.08-.007-1.853-.588-1.935-1.32H9.108c.069 1.327 1.224 2.386 3.083 2.386 1.935 0 3.343-1.155 3.309-2.789-.027-1.51-1.251-2.16-2.037-2.249v-.068c.704-.123 1.764-.91 1.723-2.229-.035-1.353-1.176-2.4-2.954-2.385-1.873.006-2.857 1.162-2.898 2.358h1.196c.062-.69.711-1.299 1.696-1.299.998 0 1.695.622 1.695 1.525.007.922-.718 1.592-1.695 1.592h-.964v1.074z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-type-italic" fill="currentColor" id="type-italic" xmlns="http://www.w3.org/2000/svg"><path d="M7.991 11.674L9.53 4.455c.123-.595.246-.71 1.347-.807l.11-.52H7.211l-.11.52c1.06.096 1.128.212 1.005.807L6.57 11.674c-.123.595-.246.71-1.346.806l-.11.52h3.774l.11-.52c-1.06-.095-1.129-.211-1.006-.806z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-type-strikethrough" fill="currentColor" id="type-strikethrough" xmlns="http://www.w3.org/2000/svg"><path d="M8.527 13.164c-2.153 0-3.589-1.107-3.705-2.81h1.23c.144 1.06 1.129 1.703 2.544 1.703 1.34 0 2.31-.705 2.31-1.675 0-.827-.547-1.374-1.914-1.675L8.046 8.5h3.45c.468.437.675.994.675 1.697 0 1.826-1.436 2.967-3.644 2.967zM6.602 6.5H5.167a2.776 2.776 0 01-.099-.76c0-1.627 1.436-2.768 3.48-2.768 1.969 0 3.39 1.175 3.445 2.85h-1.23c-.11-1.08-.964-1.743-2.25-1.743-1.23 0-2.18.602-2.18 1.607 0 .31.083.581.27.814z"/><path fill-rule="evenodd" d="M15 8.5H1v-1h14v1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-type-underline" fill="currentColor" id="type-underline" xmlns="http://www.w3.org/2000/svg"><path d="M5.313 3.136h-1.23V9.54c0 2.105 1.47 3.623 3.917 3.623s3.917-1.518 3.917-3.623V3.136h-1.23v6.323c0 1.49-.978 2.57-2.687 2.57-1.709 0-2.687-1.08-2.687-2.57V3.136z"/><path fill-rule="evenodd" d="M12.5 15h-9v-1h9v1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-ui-checks" fill="currentColor" id="ui-checks" xmlns="http://www.w3.org/2000/svg"><path d="M7 2.5a.5.5 0 01.5-.5h7a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-7a.5.5 0 01-.5-.5v-1z"/><path fill-rule="evenodd" d="M2 1a2 2 0 00-2 2v2a2 2 0 002 2h2a2 2 0 002-2V3a2 2 0 00-2-2H2zm0 8a2 2 0 00-2 2v2a2 2 0 002 2h2a2 2 0 002-2v-2a2 2 0 00-2-2H2zm.854-3.646l2-2a.5.5 0 10-.708-.708L2.5 4.293l-.646-.647a.5.5 0 10-.708.708l1 1a.5.5 0 00.708 0zm0 8l2-2a.5.5 0 00-.708-.708L2.5 12.293l-.646-.647a.5.5 0 00-.708.708l1 1a.5.5 0 00.708 0z"/><path d="M7 10.5a.5.5 0 01.5-.5h7a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-7a.5.5 0 01-.5-.5v-1z"/><path fill-rule="evenodd" d="M7 5.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0 8a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-ui-checks-grid" fill="currentColor" id="ui-checks-grid" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 10a1 1 0 00-1 1v3a1 1 0 001 1h3a1 1 0 001-1v-3a1 1 0 00-1-1H2zm9-9a1 1 0 00-1 1v3a1 1 0 001 1h3a1 1 0 001-1V2a1 1 0 00-1-1h-3zm0 9a1 1 0 00-1 1v3a1 1 0 001 1h3a1 1 0 001-1v-3a1 1 0 00-1-1h-3zm0-10a2 2 0 00-2 2v3a2 2 0 002 2h3a2 2 0 002-2V2a2 2 0 00-2-2h-3zM2 9a2 2 0 00-2 2v3a2 2 0 002 2h3a2 2 0 002-2v-3a2 2 0 00-2-2H2zm7 2a2 2 0 012-2h3a2 2 0 012 2v3a2 2 0 01-2 2h-3a2 2 0 01-2-2v-3zM0 2a2 2 0 012-2h3a2 2 0 012 2v3a2 2 0 01-2 2H2a2 2 0 01-2-2V2zm5.354.854l-2 2a.5.5 0 01-.708 0l-1-1a.5.5 0 11.708-.708L3 3.793l1.646-1.647a.5.5 0 11.708.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-ui-radios" fill="currentColor" id="ui-radios" xmlns="http://www.w3.org/2000/svg"><path d="M7 2.5a.5.5 0 01.5-.5h7a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-7a.5.5 0 01-.5-.5v-1zM0 12a3 3 0 116 0 3 3 0 01-6 0zm7-1.5a.5.5 0 01.5-.5h7a.5.5 0 01.5.5v1a.5.5 0 01-.5.5h-7a.5.5 0 01-.5-.5v-1z"/><path fill-rule="evenodd" d="M7 5.5a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zm0 8a.5.5 0 01.5-.5h5a.5.5 0 010 1h-5a.5.5 0 01-.5-.5zM3 1a3 3 0 100 6 3 3 0 000-6zm0 4.5a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-ui-radios-grid" fill="currentColor" id="ui-radios-grid" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3.5 15a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm9-9a2.5 2.5 0 100-5 2.5 2.5 0 000 5zm0 9a2.5 2.5 0 100-5 2.5 2.5 0 000 5zM16 3.5a3.5 3.5 0 11-7 0 3.5 3.5 0 017 0zm-9 9a3.5 3.5 0 11-7 0 3.5 3.5 0 017 0zm5.5 3.5a3.5 3.5 0 100-7 3.5 3.5 0 000 7zm-9-11a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm0 2a3.5 3.5 0 100-7 3.5 3.5 0 000 7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-union" fill="currentColor" id="union" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 2a2 2 0 012-2h8a2 2 0 012 2v2h2a2 2 0 012 2v8a2 2 0 01-2 2H6a2 2 0 01-2-2v-2H2a2 2 0 01-2-2V2z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-unlock" fill="currentColor" id="unlock" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.655 8H2.333c-.264 0-.398.068-.471.121a.73.73 0 00-.224.296 1.626 1.626 0 00-.138.59V14c0 .342.076.531.14.635.064.106.151.18.256.237a1.122 1.122 0 00.436.127l.013.001h7.322c.264 0 .398-.068.471-.121a.73.73 0 00.224-.296 1.627 1.627 0 00.138-.59V9c0-.342-.076-.531-.14-.635a.658.658 0 00-.255-.237A1.122 1.122 0 009.655 8zm.012-1H2.333C.5 7 .5 9 .5 9v5c0 2 1.833 2 1.833 2h7.334c1.833 0 1.833-2 1.833-2V9c0-2-1.833-2-1.833-2zM8.5 4a3.5 3.5 0 117 0v3h-1V4a2.5 2.5 0 00-5 0v3h-1V4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-unlock-fill" fill="currentColor" id="unlock-fill" xmlns="http://www.w3.org/2000/svg"><path d="M.5 9a2 2 0 012-2h7a2 2 0 012 2v5a2 2 0 01-2 2h-7a2 2 0 01-2-2V9z"/><path fill-rule="evenodd" d="M8.5 4a3.5 3.5 0 117 0v3h-1V4a2.5 2.5 0 00-5 0v3h-1V4z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-upc" fill="currentColor" id="upc" xmlns="http://www.w3.org/2000/svg"><path d="M3 4.5a.5.5 0 011 0v7a.5.5 0 01-1 0v-7zm2 0a.5.5 0 011 0v7a.5.5 0 01-1 0v-7zm2 0a.5.5 0 011 0v7a.5.5 0 01-1 0v-7zm2 0a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v7a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-7zm3 0a.5.5 0 011 0v7a.5.5 0 01-1 0v-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-upc-scan" fill="currentColor" id="upc-scan" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1.5 1a.5.5 0 00-.5.5v3a.5.5 0 01-1 0v-3A1.5 1.5 0 011.5 0h3a.5.5 0 010 1h-3zM11 .5a.5.5 0 01.5-.5h3A1.5 1.5 0 0116 1.5v3a.5.5 0 01-1 0v-3a.5.5 0 00-.5-.5h-3a.5.5 0 01-.5-.5zM.5 11a.5.5 0 01.5.5v3a.5.5 0 00.5.5h3a.5.5 0 010 1h-3A1.5 1.5 0 010 14.5v-3a.5.5 0 01.5-.5zm15 0a.5.5 0 01.5.5v3a1.5 1.5 0 01-1.5 1.5h-3a.5.5 0 010-1h3a.5.5 0 00.5-.5v-3a.5.5 0 01.5-.5z"/><path d="M3 4.5a.5.5 0 011 0v7a.5.5 0 01-1 0v-7zm2 0a.5.5 0 011 0v7a.5.5 0 01-1 0v-7zm2 0a.5.5 0 011 0v7a.5.5 0 01-1 0v-7zm2 0a.5.5 0 01.5-.5h1a.5.5 0 01.5.5v7a.5.5 0 01-.5.5h-1a.5.5 0 01-.5-.5v-7zm3 0a.5.5 0 011 0v7a.5.5 0 01-1 0v-7z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-upload" fill="currentColor" id="upload" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.5 9.9a.5.5 0 01.5.5v2.5a1 1 0 001 1h12a1 1 0 001-1v-2.5a.5.5 0 011 0v2.5a2 2 0 01-2 2H2a2 2 0 01-2-2v-2.5a.5.5 0 01.5-.5z"/><path fill-rule="evenodd" d="M7.646 1.146a.5.5 0 01.708 0l3 3a.5.5 0 01-.708.708L8.5 2.707V11.5a.5.5 0 01-1 0V2.707L5.354 4.854a.5.5 0 11-.708-.708l3-3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-vector-pen" fill="currentColor" id="vector-pen" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.646.646a.5.5 0 01.708 0l4 4a.5.5 0 010 .708l-1.902 1.902-.829 3.313a1.5 1.5 0 01-1.024 1.073L1.254 14.746 4.358 4.4A1.5 1.5 0 015.43 3.377l3.313-.828L10.646.646zm-1.8 2.908l-3.173.793a.5.5 0 00-.358.342l-2.57 8.565 8.567-2.57a.5.5 0 00.34-.357l.794-3.174-3.6-3.6z"/><path fill-rule="evenodd" d="M2.832 13.228L8 9a1 1 0 10-1-1l-4.228 5.168-.026.086.086-.026z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-view-list" fill="currentColor" id="view-list" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 4.5h10a2 2 0 012 2v3a2 2 0 01-2 2H3a2 2 0 01-2-2v-3a2 2 0 012-2zm0 1a1 1 0 00-1 1v3a1 1 0 001 1h10a1 1 0 001-1v-3a1 1 0 00-1-1H3zM1 2a.5.5 0 01.5-.5h13a.5.5 0 010 1h-13A.5.5 0 011 2zm0 12a.5.5 0 01.5-.5h13a.5.5 0 010 1h-13A.5.5 0 011 14z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-view-stacked" fill="currentColor" id="view-stacked" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 0h10a2 2 0 012 2v3a2 2 0 01-2 2H3a2 2 0 01-2-2V2a2 2 0 012-2zm0 1a1 1 0 00-1 1v3a1 1 0 001 1h10a1 1 0 001-1V2a1 1 0 00-1-1H3zm0 8h10a2 2 0 012 2v3a2 2 0 01-2 2H3a2 2 0 01-2-2v-3a2 2 0 012-2zm0 1a1 1 0 00-1 1v3a1 1 0 001 1h10a1 1 0 001-1v-3a1 1 0 00-1-1H3z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-voicemail" fill="currentColor" id="voicemail" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7 8.5A3.49 3.49 0 015.95 11h4.1a3.5 3.5 0 112.45 1h-9A3.5 3.5 0 117 8.5zm-6 0a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0zm14 0a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-volume-down" fill="currentColor" id="volume-down" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.717 3.55A.5.5 0 019 4v8a.5.5 0 01-.812.39L5.825 10.5H3.5A.5.5 0 013 10V6a.5.5 0 01.5-.5h2.325l2.363-1.89a.5.5 0 01.529-.06zM8 5.04L6.312 6.39A.5.5 0 016 6.5H4v3h2a.5.5 0 01.312.11L8 10.96V5.04z"/><path d="M10.707 11.182A4.486 4.486 0 0012.025 8a4.486 4.486 0 00-1.318-3.182L10 5.525A3.489 3.489 0 0111.025 8c0 .966-.392 1.841-1.025 2.475l.707.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-volume-down-fill" fill="currentColor" id="volume-down-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8.717 3.55A.5.5 0 019 4v8a.5.5 0 01-.812.39L5.825 10.5H3.5A.5.5 0 013 10V6a.5.5 0 01.5-.5h2.325l2.363-1.89a.5.5 0 01.529-.06z"/><path d="M10.707 11.182A4.486 4.486 0 0012.025 8a4.486 4.486 0 00-1.318-3.182L10 5.525A3.489 3.489 0 0111.025 8c0 .966-.392 1.841-1.025 2.475l.707.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-volume-mute" fill="currentColor" id="volume-mute" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.717 3.55A.5.5 0 017 4v8a.5.5 0 01-.812.39L3.825 10.5H1.5A.5.5 0 011 10V6a.5.5 0 01.5-.5h2.325l2.363-1.89a.5.5 0 01.529-.06zM6 5.04L4.312 6.39A.5.5 0 014 6.5H2v3h2a.5.5 0 01.312.11L6 10.96V5.04zm7.854.606a.5.5 0 010 .708l-4 4a.5.5 0 01-.708-.708l4-4a.5.5 0 01.708 0z"/><path fill-rule="evenodd" d="M9.146 5.646a.5.5 0 000 .708l4 4a.5.5 0 00.708-.708l-4-4a.5.5 0 00-.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-volume-mute-fill" fill="currentColor" id="volume-mute-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.717 3.55A.5.5 0 017 4v8a.5.5 0 01-.812.39L3.825 10.5H1.5A.5.5 0 011 10V6a.5.5 0 01.5-.5h2.325l2.363-1.89a.5.5 0 01.529-.06zm7.137 2.096a.5.5 0 010 .708l-4 4a.5.5 0 01-.708-.708l4-4a.5.5 0 01.708 0z"/><path fill-rule="evenodd" d="M9.146 5.646a.5.5 0 000 .708l4 4a.5.5 0 00.708-.708l-4-4a.5.5 0 00-.708 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-volume-off" fill="currentColor" id="volume-off" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.717 3.55A.5.5 0 0111 4v8a.5.5 0 01-.812.39L7.825 10.5H5.5A.5.5 0 015 10V6a.5.5 0 01.5-.5h2.325l2.363-1.89a.5.5 0 01.529-.06zM10 5.04L8.312 6.39A.5.5 0 018 6.5H6v3h2a.5.5 0 01.312.11L10 10.96V5.04z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-volume-off-fill" fill="currentColor" id="volume-off-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M10.717 3.55A.5.5 0 0111 4v8a.5.5 0 01-.812.39L7.825 10.5H5.5A.5.5 0 015 10V6a.5.5 0 01.5-.5h2.325l2.363-1.89a.5.5 0 01.529-.06z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-volume-up" fill="currentColor" id="volume-up" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.717 3.55A.5.5 0 017 4v8a.5.5 0 01-.812.39L3.825 10.5H1.5A.5.5 0 011 10V6a.5.5 0 01.5-.5h2.325l2.363-1.89a.5.5 0 01.529-.06zM6 5.04L4.312 6.39A.5.5 0 014 6.5H2v3h2a.5.5 0 01.312.11L6 10.96V5.04z"/><path d="M11.536 14.01A8.473 8.473 0 0014.026 8a8.473 8.473 0 00-2.49-6.01l-.708.707A7.476 7.476 0 0113.025 8c0 2.071-.84 3.946-2.197 5.303l.708.707z"/><path d="M10.121 12.596A6.48 6.48 0 0012.025 8a6.48 6.48 0 00-1.904-4.596l-.707.707A5.483 5.483 0 0111.025 8a5.483 5.483 0 01-1.61 3.89l.706.706z"/><path d="M8.707 11.182A4.486 4.486 0 0010.025 8a4.486 4.486 0 00-1.318-3.182L8 5.525A3.489 3.489 0 019.025 8 3.49 3.49 0 018 10.475l.707.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-volume-up-fill" fill="currentColor" id="volume-up-fill" xmlns="http://www.w3.org/2000/svg"><path d="M11.536 14.01A8.473 8.473 0 0014.026 8a8.473 8.473 0 00-2.49-6.01l-.708.707A7.476 7.476 0 0113.025 8c0 2.071-.84 3.946-2.197 5.303l.708.707z"/><path d="M10.121 12.596A6.48 6.48 0 0012.025 8a6.48 6.48 0 00-1.904-4.596l-.707.707A5.483 5.483 0 0111.025 8a5.483 5.483 0 01-1.61 3.89l.706.706z"/><path d="M8.707 11.182A4.486 4.486 0 0010.025 8a4.486 4.486 0 00-1.318-3.182L8 5.525A3.489 3.489 0 019.025 8 3.49 3.49 0 018 10.475l.707.707z"/><path fill-rule="evenodd" d="M6.717 3.55A.5.5 0 017 4v8a.5.5 0 01-.812.39L3.825 10.5H1.5A.5.5 0 011 10V6a.5.5 0 01.5-.5h2.325l2.363-1.89a.5.5 0 01.529-.06z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-vr" fill="currentColor" id="vr" xmlns="http://www.w3.org/2000/svg"><path d="M3 12V4a1 1 0 011-1h2.5V2H4a2 2 0 00-2 2v8a2 2 0 002 2h2.5v-1H4a1 1 0 01-1-1zm6.5 1v1H12a2 2 0 002-2V4a2 2 0 00-2-2H9.5v1H12a1 1 0 011 1v8a1 1 0 01-1 1H9.5z"/><path fill-rule="evenodd" d="M8 16a.5.5 0 01-.5-.5V.5a.5.5 0 011 0v15a.5.5 0 01-.5.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-wallet" fill="currentColor" id="wallet" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M0 3a2 2 0 012-2h13.5a.5.5 0 010 1H15v2a1 1 0 011 1v8.5a1.5 1.5 0 01-1.5 1.5h-12A2.5 2.5 0 010 12.5V3zm1 1.732V12.5A1.5 1.5 0 002.5 14h12a.5.5 0 00.5-.5V5H2a1.99 1.99 0 01-1-.268zM1 3a1 1 0 001 1h12V2H2a1 1 0 00-1 1z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-wallet-fill" fill="currentColor" id="wallet-fill" xmlns="http://www.w3.org/2000/svg"><path d="M1.5 2A1.5 1.5 0 000 3.5v2h6a.5.5 0 01.5.5c0 .253.08.644.306.958.207.288.557.542 1.194.542.637 0 .987-.254 1.194-.542.226-.314.306-.705.306-.958a.5.5 0 01.5-.5h6v-2A1.5 1.5 0 0014.5 2h-13z"/><path d="M16 6.5h-5.551a2.678 2.678 0 01-.443 1.042C9.613 8.088 8.963 8.5 8 8.5c-.963 0-1.613-.412-2.006-.958A2.679 2.679 0 015.551 6.5H0v6A1.5 1.5 0 001.5 14h13a1.5 1.5 0 001.5-1.5v-6z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-wallet2" fill="currentColor" id="wallet2" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M12.136.326A1.5 1.5 0 0114 1.78V3h.5A1.5 1.5 0 0116 4.5v9a1.5 1.5 0 01-1.5 1.5h-13A1.5 1.5 0 010 13.5v-9a1.5 1.5 0 011.432-1.499L12.136.326zM5.562 3H13V1.78a.5.5 0 00-.621-.484L5.562 3zM1.5 4a.5.5 0 00-.5.5v9a.5.5 0 00.5.5h13a.5.5 0 00.5-.5v-9a.5.5 0 00-.5-.5h-13z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-watch" fill="currentColor" id="watch" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4 14.333v-1.86A5.985 5.985 0 012 8c0-1.777.772-3.374 2-4.472V1.667C4 .747 4.746 0 5.667 0h4.666C11.253 0 12 .746 12 1.667v1.86A5.985 5.985 0 0114 8a5.985 5.985 0 01-2 4.472v1.861c0 .92-.746 1.667-1.667 1.667H5.667C4.747 16 4 15.254 4 14.333zM13 8A5 5 0 103 8a5 5 0 0010 0z"/><path d="M13.918 8.993A.502.502 0 0014.5 8.5v-1a.5.5 0 00-.582-.493 6.044 6.044 0 010 1.986z"/><path fill-rule="evenodd" d="M8 4.5a.5.5 0 01.5.5v3a.5.5 0 01-.5.5H6a.5.5 0 010-1h1.5V5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-wifi" fill="currentColor" id="wifi" xmlns="http://www.w3.org/2000/svg"><path d="M15.385 6.115a.485.485 0 00-.048-.736A12.443 12.443 0 008 3 12.44 12.44 0 00.663 5.379a.485.485 0 00-.048.736.518.518 0 00.668.05A11.448 11.448 0 018 4c2.507 0 4.827.802 6.717 2.164.204.148.489.13.668-.049z"/><path d="M13.229 8.271c.216-.216.194-.578-.063-.745A9.456 9.456 0 008 6c-1.905 0-3.68.56-5.166 1.526a.48.48 0 00-.063.745.525.525 0 00.652.065A8.46 8.46 0 018 7a8.46 8.46 0 014.577 1.336c.205.132.48.108.652-.065zm-2.183 2.183c.226-.226.185-.605-.1-.75A6.472 6.472 0 008 9c-1.06 0-2.062.254-2.946.704-.285.145-.326.524-.1.75l.015.015c.16.16.408.19.611.09A5.478 5.478 0 018 10c.868 0 1.69.201 2.42.56.203.1.45.07.611-.091l.015-.015zM9.06 12.44c.196-.196.198-.52-.04-.66A1.99 1.99 0 008 11.5a1.99 1.99 0 00-1.02.28c-.238.14-.236.464-.04.66l.706.706a.5.5 0 00.708 0l.707-.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-wifi-1" fill="currentColor" id="wifi-1" xmlns="http://www.w3.org/2000/svg"><path d="M11.046 10.454c.226-.226.185-.605-.1-.75A6.473 6.473 0 008 9c-1.06 0-2.062.254-2.946.704-.285.145-.326.524-.1.75l.015.015c.16.16.407.19.611.09A5.478 5.478 0 018 10c.868 0 1.69.201 2.42.56.203.1.45.07.611-.091l.015-.015zM9.06 12.44c.196-.196.198-.52-.04-.66A1.99 1.99 0 008 11.5a1.99 1.99 0 00-1.02.28c-.238.14-.236.464-.04.66l.706.706a.5.5 0 00.707 0l.708-.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-wifi-2" fill="currentColor" id="wifi-2" xmlns="http://www.w3.org/2000/svg"><path d="M13.229 8.271c.216-.216.194-.578-.063-.745A9.456 9.456 0 008 6c-1.905 0-3.68.56-5.166 1.526a.48.48 0 00-.063.745.525.525 0 00.652.065A8.46 8.46 0 018 7a8.46 8.46 0 014.577 1.336c.205.132.48.108.652-.065zm-2.183 2.183c.226-.226.185-.605-.1-.75A6.473 6.473 0 008 9c-1.06 0-2.062.254-2.946.704-.285.145-.326.524-.1.75l.015.015c.16.16.408.19.611.09A5.478 5.478 0 018 10c.868 0 1.69.201 2.42.56.203.1.45.07.611-.091l.015-.015zM9.06 12.44c.196-.196.198-.52-.04-.66A1.99 1.99 0 008 11.5a1.99 1.99 0 00-1.02.28c-.238.14-.236.464-.04.66l.706.706a.5.5 0 00.708 0l.707-.707z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-wifi-off" fill="currentColor" id="wifi-off" xmlns="http://www.w3.org/2000/svg"><path d="M10.706 3.294A12.545 12.545 0 008 3 12.44 12.44 0 00.663 5.379a.485.485 0 00-.048.736.518.518 0 00.668.05A11.448 11.448 0 018 4c.63 0 1.249.05 1.852.148l.854-.854zM8 6c-1.905 0-3.68.56-5.166 1.526a.48.48 0 00-.063.745.525.525 0 00.652.065 8.448 8.448 0 013.51-1.27L8 6zm2.596 1.404l.785-.785c.63.24 1.228.545 1.785.907a.482.482 0 01.063.745.525.525 0 01-.652.065 8.462 8.462 0 00-1.98-.932zM8 10l.934-.933a6.454 6.454 0 012.012.637c.285.145.326.524.1.75l-.015.015a.532.532 0 01-.611.09A5.478 5.478 0 008 10zm4.905-4.905l.747-.747c.59.3 1.153.645 1.685 1.03a.485.485 0 01.048.737.518.518 0 01-.668.05 11.496 11.496 0 00-1.812-1.07zM9.02 11.78c.238.14.236.464.04.66l-.706.706a.5.5 0 01-.708 0l-.707-.707c-.195-.195-.197-.518.04-.66A1.99 1.99 0 018 11.5c.373 0 .722.102 1.02.28zm4.355-9.905a.53.53 0 11.75.75l-10.75 10.75a.53.53 0 01-.75-.75l10.75-10.75z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-window" fill="currentColor" id="window" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 2H2a1 1 0 00-1 1v10a1 1 0 001 1h12a1 1 0 001-1V3a1 1 0 00-1-1zM2 1a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V3a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M15 6H1V5h14v1z"/><path d="M3 3.5a.5.5 0 11-1 0 .5.5 0 011 0zm1.5 0a.5.5 0 11-1 0 .5.5 0 011 0zm1.5 0a.5.5 0 11-1 0 .5.5 0 011 0z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-wrench" fill="currentColor" id="wrench" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M.102 2.223A3.004 3.004 0 003.78 5.897l6.341 6.252A3.003 3.003 0 0013 16a3 3 0 10-.851-5.878L5.897 3.781A3.004 3.004 0 002.223.1l2.141 2.142L4 4l-1.757.364L.102 2.223zm13.37 9.019L13 11l-.471.242-.529.026-.287.445-.445.287-.026.529L11 13l.242.471.026.529.445.287.287.445.529.026L13 15l.471-.242.529-.026.287-.445.445-.287.026-.529L15 13l-.242-.471-.026-.529-.445-.287-.287-.445-.529-.026z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-x" fill="currentColor" id="x" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 01.708 0L8 7.293l2.646-2.647a.5.5 0 01.708.708L8.707 8l2.647 2.646a.5.5 0 01-.708.708L8 8.707l-2.646 2.647a.5.5 0 01-.708-.708L7.293 8 4.646 5.354a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-x-circle" fill="currentColor" id="x-circle" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z"/><path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 01.708 0L8 7.293l2.646-2.647a.5.5 0 01.708.708L8.707 8l2.647 2.646a.5.5 0 01-.708.708L8 8.707l-2.646 2.647a.5.5 0 01-.708-.708L7.293 8 4.646 5.354a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-x-circle-fill" fill="currentColor" id="x-circle-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M16 8A8 8 0 110 8a8 8 0 0116 0zM5.354 4.646a.5.5 0 10-.708.708L7.293 8l-2.647 2.646a.5.5 0 00.708.708L8 8.707l2.646 2.647a.5.5 0 00.708-.708L8.707 8l2.647-2.646a.5.5 0 00-.708-.708L8 7.293 5.354 4.646z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-x-diamond" fill="currentColor" id="x-diamond" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.95.435c.58-.58 1.52-.58 2.1 0l6.515 6.516c.58.58.58 1.519 0 2.098L9.05 15.565c-.58.58-1.519.58-2.098 0L.435 9.05a1.482 1.482 0 010-2.098L6.95.435zm1.4.7a.495.495 0 00-.7 0L1.134 7.65a.495.495 0 000 .7l6.516 6.516a.495.495 0 00.7 0l6.516-6.516a.495.495 0 000-.7L8.35 1.134z"/><path fill-rule="evenodd" d="M8.361 1.17a.51.51 0 00-.722 0L4.766 4.044 8 7.278l3.234-3.234L8.361 1.17zm3.595 3.596L8.722 8l3.234 3.234 2.873-2.873c.2-.2.2-.523 0-.722l-2.873-2.873zm-.722 7.19L8 8.722l-3.234 3.234 2.873 2.873c.2.2.523.2.722 0l2.873-2.873zm-7.19-.722L7.278 8 4.044 4.766 1.17 7.639a.511.511 0 000 .722l2.874 2.873zM6.917.45a1.531 1.531 0 012.166 0l6.469 6.468a1.532 1.532 0 010 2.166l-6.47 6.469a1.532 1.532 0 01-2.165 0L.45 9.082a1.531 1.531 0 010-2.165L6.917.45z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-x-diamond-fill" fill="currentColor" id="x-diamond-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.05.435c-.58-.58-1.52-.58-2.1 0L4.047 3.339 8 7.293l3.954-3.954L9.049.435zm3.61 3.611L8.708 8l3.954 3.954 2.904-2.905c.58-.58.58-1.519 0-2.098l-2.904-2.905zm-.706 8.615L8 8.707l-3.954 3.954 2.905 2.904c.58.58 1.519.58 2.098 0l2.905-2.904zm-8.615-.707L7.293 8 3.339 4.046.435 6.951c-.58.58-.58 1.519 0 2.098l2.904 2.905z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-x-octagon" fill="currentColor" id="x-octagon" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.54.146A.5.5 0 014.893 0h6.214a.5.5 0 01.353.146l4.394 4.394a.5.5 0 01.146.353v6.214a.5.5 0 01-.146.353l-4.394 4.394a.5.5 0 01-.353.146H4.893a.5.5 0 01-.353-.146L.146 11.46A.5.5 0 010 11.107V4.893a.5.5 0 01.146-.353L4.54.146zM5.1 1L1 5.1v5.8L5.1 15h5.8l4.1-4.1V5.1L10.9 1H5.1z"/><path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 01.708 0L8 7.293l2.646-2.647a.5.5 0 01.708.708L8.707 8l2.647 2.646a.5.5 0 01-.708.708L8 8.707l-2.646 2.647a.5.5 0 01-.708-.708L7.293 8 4.646 5.354a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-x-octagon-fill" fill="currentColor" id="x-octagon-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.46.146A.5.5 0 0011.107 0H4.893a.5.5 0 00-.353.146L.146 4.54A.5.5 0 000 4.893v6.214a.5.5 0 00.146.353l4.394 4.394a.5.5 0 00.353.146h6.214a.5.5 0 00.353-.146l4.394-4.394a.5.5 0 00.146-.353V4.893a.5.5 0 00-.146-.353L11.46.146zm-6.106 4.5a.5.5 0 10-.708.708L7.293 8l-2.647 2.646a.5.5 0 00.708.708L8 8.707l2.646 2.647a.5.5 0 00.708-.708L8.707 8l2.647-2.646a.5.5 0 00-.708-.708L8 7.293 5.354 4.646z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-x-square" fill="currentColor" id="x-square" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M14 1H2a1 1 0 00-1 1v12a1 1 0 001 1h12a1 1 0 001-1V2a1 1 0 00-1-1zM2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2z"/><path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 01.708 0L8 7.293l2.646-2.647a.5.5 0 01.708.708L8.707 8l2.647 2.646a.5.5 0 01-.708.708L8 8.707l-2.646 2.647a.5.5 0 01-.708-.708L7.293 8 4.646 5.354a.5.5 0 010-.708z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-x-square-fill" fill="currentColor" id="x-square-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M2 0a2 2 0 00-2 2v12a2 2 0 002 2h12a2 2 0 002-2V2a2 2 0 00-2-2H2zm3.354 4.646a.5.5 0 10-.708.708L7.293 8l-2.647 2.646a.5.5 0 00.708.708L8 8.707l2.646 2.647a.5.5 0 00.708-.708L8.707 8l2.647-2.646a.5.5 0 00-.708-.708L8 7.293 5.354 4.646z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-zoom-in" fill="currentColor" id="zoom-in" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 100-11 5.5 5.5 0 000 11zM13 6.5a6.5 6.5 0 11-13 0 6.5 6.5 0 0113 0z"/><path d="M10.344 11.742c.03.04.062.078.098.115l3.85 3.85a1 1 0 001.415-1.414l-3.85-3.85a1.007 1.007 0 00-.115-.1 6.538 6.538 0 01-1.398 1.4z"/><path fill-rule="evenodd" d="M6.5 3a.5.5 0 01.5.5V6h2.5a.5.5 0 010 1H7v2.5a.5.5 0 01-1 0V7H3.5a.5.5 0 010-1H6V3.5a.5.5 0 01.5-.5z"/></symbol><symbol viewBox="0 0 16 16" class="bi bi-zoom-out" fill="currentColor" id="zoom-out" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M6.5 12a5.5 5.5 0 100-11 5.5 5.5 0 000 11zM13 6.5a6.5 6.5 0 11-13 0 6.5 6.5 0 0113 0z"/><path d="M10.344 11.742c.03.04.062.078.098.115l3.85 3.85a1 1 0 001.415-1.414l-3.85-3.85a1.007 1.007 0 00-.115-.1 6.538 6.538 0 01-1.398 1.4z"/><path fill-rule="evenodd" d="M3 6.5a.5.5 0 01.5-.5h6a.5.5 0 010 1h-6a.5.5 0 01-.5-.5z"/></symbol></svg>
\ No newline at end of file
diff --git a/ccm-core/src/main/scss/ccm-admin/_custom.scss b/ccm-core/src/main/scss/ccm-admin/_custom.scss
new file mode 100644
index 000000000..ba3e0c8f6
--- /dev/null
+++ b/ccm-core/src/main/scss/ccm-admin/_custom.scss
@@ -0,0 +1,60 @@
+
+$grid-breakpoints: (
+    xs: 0,
+    sm: 36rem,
+    md: 48rem,
+    lg: 62rem,
+    xl: 75rem
+);
+
+$container-max-widths: (
+    sm: 33.75rem,
+    md: 45rem,
+    lg: 60rem,
+    xl: 71.25rem
+);
+
+$grid-gutter-width: 1.875rem;
+
+$form-grid-gutter-width: 0.625rem;
+
+$tooltip-max-width: 12.5rem;
+
+$popover-maxwidth: 17.25rem;
+
+$toast-max-width: 21.875rem;
+
+$modal-xl: 71.25rem;
+$modal-lg: 50rem;
+$modal-md: 31.25rem;
+$modal-sm: 18.75rem;
+
+$modal-fade-transform: translate(0, -3.125rem);
+
+$carousel-indicator-width: 1.875rem;
+$carousel-control-icon-width: 1.25rem;
+
+$pre-scrollable-max-height: 21.25rem;
+
+// Navbar default colors have insufficient contrast
+$navbar-dark-color: #fff;
+
+table.users-table,
+table.groups-table,
+table.roles-table {
+    tbody {
+        td.action-col {
+            width: 8em;
+        }
+    }
+}
+
+table.group-members,
+table.group-roles,
+table.role-members {
+    tbody {
+        td.action-col {
+            width: 8em;
+        }
+    }
+}
diff --git a/ccm-core/src/main/scss/ccm-admin/ccm-admin.scss b/ccm-core/src/main/scss/ccm-admin/ccm-admin.scss
index a35964e3e..4c04ef71d 100644
--- a/ccm-core/src/main/scss/ccm-admin/ccm-admin.scss
+++ b/ccm-core/src/main/scss/ccm-admin/ccm-admin.scss
@@ -1 +1,2 @@
+@import "custom";
 @import "../../../../node_modules/bootstrap/scss/bootstrap";
\ No newline at end of file

From 28e205a89ee76c681228b7468f00dfe7bfb527d7 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 21 Sep 2020 21:15:18 +0200
Subject: [PATCH 05/93] Placeholder pages for admin

---
 ccm-bundle-devel-wildfly/faces-config.NavData |  6 ++
 .../applications/ApplicationsController.java  | 46 ++++++++++
 .../admin/applications/ApplicationsPage.java  | 78 ++++++++++++++++
 .../categories/CategoriesController.java      | 46 ++++++++++
 .../ui/admin/categories/CategoriesPage.java   | 78 ++++++++++++++++
 .../ConfigurationController.java              | 46 ++++++++++
 .../configuration/ConfigurationPage.java      | 77 ++++++++++++++++
 .../admin/dashboard/DashboardController.java  | 46 ++++++++++
 .../ui/admin/dashboard/DashboardPage.java     | 76 ++++++++++++++++
 .../ui/admin/imexport/ImExportController.java | 46 ++++++++++
 .../ui/admin/imexport/ImExportPage.java       | 78 ++++++++++++++++
 .../ui/admin/sites/SitesController.java       | 46 ++++++++++
 .../libreccm/ui/admin/sites/SitesPage.java    | 76 ++++++++++++++++
 .../SystemInformationPage.java                |  2 +-
 .../UsersGroupsRolesController.java           | 46 ++++++++++
 .../UsersGroupsRolesPage.java                 | 78 ++++++++++++++++
 .../org/libreccm/ui/admin/applications.xhtml  | 16 ++++
 .../org/libreccm/ui/admin/categories.xhtml    | 16 ++++
 .../org/libreccm/ui/admin/ccm-admin.xhtml     | 13 +--
 .../org/libreccm/ui/admin/configuration.xhtml | 16 ++++
 .../org/libreccm/ui/admin/dashboard.xhtml     | 16 ++++
 .../org/libreccm/ui/admin/imexport.xhtml      | 16 ++++
 .../views/org/libreccm/ui/admin/sites.xhtml   | 16 ++++
 .../libreccm/ui/admin/systeminformation.xhtml | 89 ++++++++++++++++---
 .../ui/admin/users-groups-roles.xhtml         | 16 ++++
 .../org/libreccm/ui/AdminBundle.properties    | 14 +++
 .../org/libreccm/ui/AdminBundle_de.properties | 14 +++
 27 files changed, 1090 insertions(+), 23 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml

diff --git a/ccm-bundle-devel-wildfly/faces-config.NavData b/ccm-bundle-devel-wildfly/faces-config.NavData
index e69de29bb..298bfc50a 100644
--- a/ccm-bundle-devel-wildfly/faces-config.NavData
+++ b/ccm-bundle-devel-wildfly/faces-config.NavData
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scene Scope="Project" version="2">
+    <Scope Scope="Faces Configuration Only"/>
+    <Scope Scope="Project"/>
+    <Scope Scope="All Faces Configurations"/>
+</Scene>
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
new file mode 100644
index 000000000..5245c612a
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.applications;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/applications")
+public class ApplicationsController {
+    
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getPlaceholder() {
+        return "org/libreccm/ui/admin/applications.xhtml";
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
new file mode 100644
index 000000000..57b5da792
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.applications;
+
+import org.libreccm.ui.admin.AdminConstants;
+import org.libreccm.ui.admin.AdminPage;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@ApplicationScoped
+public class ApplicationsPage implements AdminPage {
+
+    @Override
+    public Set<Class<?>> getControllerClasses() {
+        final Set<Class<?>> classes = new HashSet<>();
+        classes.add(ApplicationsController.class);
+        return classes;
+    }
+
+    @Override
+    public String getPath() {
+        return "applications";
+    }
+
+    @Override
+    public String getLabelBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getLabelKey() {
+        return "applications.label";
+    }
+
+    @Override
+    public String getDescriptionBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getDescriptionKey() {
+        return "applications.description";
+    }
+
+    @Override
+    public String getIcon() {
+        return "journals";
+    }
+
+    @Override
+    public int getPosition() {
+        return 10;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
new file mode 100644
index 000000000..e15766460
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/categories")
+public class CategoriesController {
+    
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getPlaceholder() {
+        return "org/libreccm/ui/admin/categories.xhtml";
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
new file mode 100644
index 000000000..666ac70e7
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import org.libreccm.ui.admin.AdminConstants;
+import org.libreccm.ui.admin.AdminPage;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@ApplicationScoped
+public class CategoriesPage implements AdminPage {
+
+    @Override
+    public Set<Class<?>> getControllerClasses() {
+        final Set<Class<?>> classes = new HashSet<>();
+        classes.add(CategoriesController.class);
+        return classes;
+    }
+
+    @Override
+    public String getPath() {
+        return "categories";
+    }
+
+    @Override
+    public String getLabelBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getLabelKey() {
+        return "categories.label";
+    }
+
+    @Override
+    public String getDescriptionBundle() {
+       return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getDescriptionKey() {
+        return "categories.description";
+    }
+
+    @Override
+    public String getIcon() {
+        return "diagram-3-fill";
+    }
+
+    @Override
+    public int getPosition() {
+        return 20;
+    }
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
new file mode 100644
index 000000000..1e36e66c6
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.configuration;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/configuration")
+public class ConfigurationController {
+    
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getPlaceholder() {
+        return "org/libreccm/ui/admin/configuration.xhtml";
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
new file mode 100644
index 000000000..463c136e6
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.configuration;
+
+import org.libreccm.ui.admin.AdminConstants;
+import org.libreccm.ui.admin.AdminPage;
+import org.libreccm.ui.admin.categories.CategoriesController;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@ApplicationScoped
+public class ConfigurationPage implements AdminPage {
+     @Override
+    public Set<Class<?>> getControllerClasses() {
+        final Set<Class<?>> classes = new HashSet<>();
+        classes.add(ConfigurationController.class);
+        return classes;
+    }
+
+    @Override
+    public String getPath() {
+        return "configuration";
+    }
+
+    @Override
+    public String getLabelBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getLabelKey() {
+        return "configuration.label";
+    }
+
+    @Override
+    public String getDescriptionBundle() {
+       return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getDescriptionKey() {
+        return "configuration.description";
+    }
+
+    @Override
+    public String getIcon() {
+        return "gear-fill";
+    }
+
+    @Override
+    public int getPosition() {
+        return 30;
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java
new file mode 100644
index 000000000..a3b72590b
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.dashboard;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/")
+public class DashboardController {
+    
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getPlaceholder() {
+        return "org/libreccm/ui/admin/dashboard.xhtml";
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java
new file mode 100644
index 000000000..5620d3dd1
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.dashboard;
+
+import org.libreccm.ui.admin.AdminConstants;
+import org.libreccm.ui.admin.AdminPage;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@ApplicationScoped
+public class DashboardPage implements AdminPage {
+     @Override
+    public Set<Class<?>> getControllerClasses() {
+        final Set<Class<?>> classes = new HashSet<>();
+        classes.add(DashboardController.class);
+        return classes;
+    }
+
+    @Override
+    public String getPath() {
+        return "/";
+    }
+
+    @Override
+    public String getLabelBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getLabelKey() {
+        return "dashboard.label";
+    }
+
+    @Override
+    public String getDescriptionBundle() {
+       return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getDescriptionKey() {
+        return "dashboard.description";
+    }
+
+    @Override
+    public String getIcon() {
+        return "house-fill";
+    }
+
+    @Override
+    public int getPosition() {
+        return 0;
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
new file mode 100644
index 000000000..9e2dfef7b
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.imexport;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/imexport")
+public class ImExportController {
+    
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getPlaceholder() {
+        return "org/libreccm/ui/admin/imexport.xhtml";
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
new file mode 100644
index 000000000..d97224905
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.imexport;
+
+import org.libreccm.ui.admin.configuration.*;
+import org.libreccm.ui.admin.AdminConstants;
+import org.libreccm.ui.admin.AdminPage;
+import org.libreccm.ui.admin.categories.CategoriesController;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@ApplicationScoped
+public class ImExportPage implements AdminPage {
+     @Override
+    public Set<Class<?>> getControllerClasses() {
+        final Set<Class<?>> classes = new HashSet<>();
+        classes.add(ImExportController.class);
+        return classes;
+    }
+
+    @Override
+    public String getPath() {
+        return "imexport";
+    }
+
+    @Override
+    public String getLabelBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getLabelKey() {
+        return "imexport.label";
+    }
+
+    @Override
+    public String getDescriptionBundle() {
+       return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getDescriptionKey() {
+        return "imexport.description";
+    }
+
+    @Override
+    public String getIcon() {
+        return "arrow-left-right";
+    }
+
+    @Override
+    public int getPosition() {
+        return 40;
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
new file mode 100644
index 000000000..817821f05
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.sites;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/sites")
+public class SitesController {
+    
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getPlaceholder() {
+        return "org/libreccm/ui/admin/sites.xhtml";
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
new file mode 100644
index 000000000..3b80c3df7
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.sites;
+
+import org.libreccm.ui.admin.AdminConstants;
+import org.libreccm.ui.admin.AdminPage;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@ApplicationScoped
+public class SitesPage implements AdminPage {
+     @Override
+    public Set<Class<?>> getControllerClasses() {
+        final Set<Class<?>> classes = new HashSet<>();
+        classes.add(SitesController.class);
+        return classes;
+    }
+
+    @Override
+    public String getPath() {
+        return "sites";
+    }
+
+    @Override
+    public String getLabelBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getLabelKey() {
+        return "sites.label";
+    }
+
+    @Override
+    public String getDescriptionBundle() {
+       return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getDescriptionKey() {
+        return "sites.description";
+    }
+
+    @Override
+    public String getIcon() {
+        return "bookshelf";
+    }
+
+    @Override
+    public int getPosition() {
+        return 60;
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
index 1b8144474..27af5ad63 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
@@ -72,7 +72,7 @@ public class SystemInformationPage implements AdminPage {
 
     @Override
     public int getPosition() {
-        return 80;
+        return 70;
     }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
new file mode 100644
index 000000000..6cfe77e65
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/users-groups-roles")
+public class UsersGroupsRolesController {
+    
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getPlaceholder() {
+        return "org/libreccm/ui/admin/users-groups-roles.xhtml";
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
new file mode 100644
index 000000000..1800ba090
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.ui.admin.configuration.*;
+import org.libreccm.ui.admin.AdminConstants;
+import org.libreccm.ui.admin.AdminPage;
+import org.libreccm.ui.admin.categories.CategoriesController;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@ApplicationScoped
+public class UsersGroupsRolesPage implements AdminPage {
+     @Override
+    public Set<Class<?>> getControllerClasses() {
+        final Set<Class<?>> classes = new HashSet<>();
+        classes.add(UsersGroupsRolesController.class);
+        return classes;
+    }
+
+    @Override
+    public String getPath() {
+        return "users-groups-roles";
+    }
+
+    @Override
+    public String getLabelBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getLabelKey() {
+        return "usersgroupsroles.label";
+    }
+
+    @Override
+    public String getDescriptionBundle() {
+       return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getDescriptionKey() {
+        return "usersgroupsroles.description";
+    }
+
+    @Override
+    public String getIcon() {
+        return "people-fill";
+    }
+
+    @Override
+    public int getPosition() {
+        return 80;
+    }
+}
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml
new file mode 100644
index 000000000..367fdcefb
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="applications" />
+        <ui:param name="title" value="System Information" />
+        <ui:define name="main">
+            <div class="container">
+                <h1>Applications</h1>
+                <p>Placeholder</p>
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories.xhtml
new file mode 100644
index 000000000..b7a561028
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories.xhtml
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="categories" />
+        <ui:param name="title" value="Categories" />
+        <ui:define name="main">
+            <div class="container">
+                <h1>Categories</h1>
+                <p>Placeholder</p>
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
index 233030774..ec030cdf1 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
@@ -27,20 +27,9 @@
                 </button>
                 <div class="collapse navbar-collapse" id="navbarSupportedContent">
                     <ul class="navbar-nav mr-auto">
-                        <li class="nav-item">
-                            <a class="nav-link" href="#foo">
-                                <svg class="bi"
-                                     width="1em"
-                                     height="1em"
-                                     fill="currentColor">
-                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#info-circle-fill" />
-                                </svg>
-                                <span>Foo</span>
-                            </a>
-                        </li>
                         <c:forEach items="#{AdminPagesModel.adminPages}" var="page">
                             <li class="nav-item">
-                                <a class="nav-link" 
+                                <a class="nav-link #{activePage == page.path?'active':''}" 
                                    href="#{request.contextPath}/@admin/#{page.path}">
                                     <svg class="bi"
                                          width="1em"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
new file mode 100644
index 000000000..e96b95e44
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="configuration" />
+        <ui:param name="title" value="Configuration" />
+        <ui:define name="main">
+            <div class="container">
+                <h1>Configuration</h1>
+                <p>Placeholder</p>
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
new file mode 100644
index 000000000..b1d4b38ef
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="/" />
+        <ui:param name="title" value="Dashboard" />
+        <ui:define name="main">
+            <div class="container">
+                <h1>LibreCCM Admin Dashboard</h1>
+                <p>Placeholder</p>
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport.xhtml
new file mode 100644
index 000000000..76b0e2744
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport.xhtml
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="imexport" />
+        <ui:param name="title" value="Import/Export" />
+        <ui:define name="main">
+            <div class="container">
+                <h1>Import/Export</h1>
+                <p>Placeholder</p>
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites.xhtml
new file mode 100644
index 000000000..8747255cc
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites.xhtml
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="sites" />
+        <ui:param name="title" value="Sites" />
+        <ui:define name="main">
+            <div class="container">
+                <h1>Sites</h1>
+                <p>Placeholder</p>
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
index eb0301220..1135e06c9 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
@@ -4,20 +4,89 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="systeminformation" />
         <ui:param name="title" value="System Information" />
         <ui:define name="main">
             <div class="container">
                 <h1>System Information</h1>
-                <h2>LibreCCM System Information</h2>
-                <dl>
-                    <c:forEach items="#{SystemInformationModel.ccmSystemInformation}" 
-                               var="prop">
-                        <div>
-                            <dt>#{prop.key}</dt>
-                            <dd>#{prop.value}</dd>
-                        </div>
-                    </c:forEach>
-                </dl>
+                <ul class="nav nav-tabs" 
+                    id="systeminformation-tabs" 
+                    role="tablist">
+                    <li class="nav-item" role="presentation">
+                        <a class="nav-link active" 
+                           id="ccminfo-tab"
+                           data-toggle="tab"
+                           href="#ccminfo"
+                           role="tab"
+                           aria-controls="ccminfo"
+                           aria-selected="true">
+                            LibreCCM System Information
+                        </a>
+                    </li>
+                    <li class="nav-item" role="presentation">
+                        <a class="nav-link" 
+                           id="javainfo-tab"
+                           data-toggle="tab"
+                           href="#javainfo"
+                           role="tab"
+                           aria-controls="javainfo"
+                           aria-selected="false">
+                            Java System Properties
+                        </a>
+                    </li>
+                </ul>
+
+                <div class="tab-content" id="systeminfo-tabcontent">
+                    <div class="tab-pane fade show active"
+                         id="ccminfo"
+                         role="tabpanel"
+                         aria-labelled="LibreCCM System Information Tab"
+                         >
+                        <h2>LibreCCM System Information</h2>
+                        <dl>
+                            <c:forEach items="#{SystemInformationModel.ccmSystemInformation}" 
+                                       var="prop">
+                                <div>
+                                    <dt>#{prop.key}</dt>
+                                    <dd>#{prop.value}</dd>
+                                </div>
+                            </c:forEach>
+                        </dl>
+                    </div>
+                    <div class="tab-pane fade"
+                         id="javainfo"
+                         role="tabpanel"
+                         aria-labelled="Java System Properties Tab"
+                         >
+                        <h2>Java System Properties</h2>
+                        <dl>
+                            <c:forEach items="#{SystemInformationModel.javaSystemProperties}" 
+                                       var="prop">
+                                <div>
+                                    <dt>#{prop.key}</dt>
+                                    <dd>#{prop.value}</dd>
+                                </div>
+                            </c:forEach>
+                        </dl>
+                    </div>
+                </div>
+<!--                
+                <ul class="nav nav-tabs" id="myTab" role="tablist">
+  <li class="nav-item" role="presentation">
+    <a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Home</a>
+  </li>
+  <li class="nav-item" role="presentation">
+    <a class="nav-link" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">Profile</a>
+  </li>
+  <li class="nav-item" role="presentation">
+    <a class="nav-link" id="contact-tab" data-toggle="tab" href="#contact" role="tab" aria-controls="contact" aria-selected="false">Contact</a>
+  </li>
+</ul>
+<div class="tab-content" id="myTabContent">
+  <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">...</div>
+  <div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">...</div>
+  <div class="tab-pane fade" id="contact" role="tabpanel" aria-labelledby="contact-tab">...</div>
+</div>-->
             </div>
         </ui:define>
     </ui:composition>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
new file mode 100644
index 000000000..984c6243a
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="title" value="Users/Groups/Roles" />
+        <ui:define name="main">
+            <div class="container">
+                <h1>Users/Groups/Roles</h1>
+                <p>Placeholder</p>
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index c1be56855..3242d3205 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -1,2 +1,16 @@
 systeminformation.description=Provides several informations about LibreCCM and the environment
 systeminformation.label=System Information
+applications.label=Applications
+applications.description=Manage application instances
+imexport.label=Import/Export
+categories.label=Categories
+categories.description=Manage categories
+configuration.label=Configuration
+configuration.description=Manage configuration settings
+dashboard.label=Dashboard
+dashboard.description=Provides access to all applications
+imexport.description=Import and export entities
+sites.label=Sites
+sites.description=Manage sites
+usersgroupsroles.label=Users/Groups/Roles
+usersgroupsroles.description=Manage users, groups and roles
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index e58de7251..1ffeb074a 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -1,2 +1,16 @@
 systeminformation.description=Zeigt Informationen \u00fcber LibreCCM und die Umgebung
 systeminformation.label=System Informationen
+applications.label=Anwendungen
+applications.description=Verwalten der Anwendungsinstanzen
+imexport.label=Import/Export
+categories.label=Kategorien
+categories.description=Verwaltung der Kategorien
+configuration.label=Configuration
+configuration.description=Bearbeiten der Konfiguration
+dashboard.label=Dashboard
+dashboard.description=Provides access to all applications
+imexport.description=Daten importieren und exportieren
+sites.label=Sites
+sites.description=Sites verwalten
+usersgroupsroles.label=Benutzer*innen/Gruppen/Rollen
+usersgroupsroles.description=Verwaltungen von Benutzer*innen, Gruppen und Rollen

From 3ea0fb62d3f0ef9659fb932bc04dc6eafd4bd494 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 22 Sep 2020 20:07:29 +0200
Subject: [PATCH 06/93] Localized texts for Admin UI

---
 .../org/libreccm/ui/MvcLocaleResolver.java    | 45 +++++++++++
 .../org/libreccm/ui/admin/AdminMessages.java  | 79 +++++++++++++++++++
 .../admin/applications/ApplicationsPage.java  |  2 +-
 .../libreccm/ui/admin/sites/SitesPage.java    |  2 +-
 .../SystemInformationController.java          |  5 ++
 .../org/libreccm/ui/admin/applications.xhtml  | 13 ++-
 .../org/libreccm/ui/admin/categories.xhtml    | 13 ++-
 .../org/libreccm/ui/admin/ccm-admin.xhtml     | 10 +++
 .../org/libreccm/ui/admin/configuration.xhtml | 13 ++-
 .../org/libreccm/ui/admin/dashboard.xhtml     | 10 ++-
 .../org/libreccm/ui/admin/imexport.xhtml      | 13 ++-
 .../views/org/libreccm/ui/admin/sites.xhtml   | 14 +++-
 .../libreccm/ui/admin/systeminformation.xhtml | 39 ++++-----
 .../ui/admin/users-groups-roles.xhtml         | 13 ++-
 .../org/libreccm/ui/AdminBundle.properties    |  3 +
 .../org/libreccm/ui/AdminBundle_de.properties |  5 +-
 16 files changed, 239 insertions(+), 40 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/MvcLocaleResolver.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/MvcLocaleResolver.java b/ccm-core/src/main/java/org/libreccm/ui/MvcLocaleResolver.java
new file mode 100644
index 000000000..ca80dcbfa
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/MvcLocaleResolver.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui;
+
+import org.libreccm.l10n.GlobalizationHelper;
+
+import java.util.Locale;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.locale.LocaleResolver;
+import javax.mvc.locale.LocaleResolverContext;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+public class MvcLocaleResolver implements LocaleResolver {
+
+    @Inject
+    private GlobalizationHelper globalizationHelper;
+
+    @Override
+    public Locale resolveLocale(final LocaleResolverContext context) {
+        return globalizationHelper.getNegotiatedLocale();
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java
new file mode 100644
index 000000000..6890af911
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin;
+
+import org.libreccm.l10n.GlobalizationHelper;
+
+import java.util.AbstractMap;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("AdminMessages")
+public class AdminMessages extends AbstractMap<String, String> {
+
+    @Inject
+    private GlobalizationHelper globalizationHelper;
+
+    private ResourceBundle messages;
+
+    
+
+    @PostConstruct
+    private void init() {
+        messages = ResourceBundle.getBundle(
+            AdminConstants.ADMIN_BUNDLE,
+            globalizationHelper.getNegotiatedLocale()
+        );
+    }
+
+    public String getMessage(final String key) {
+        if (messages.containsKey(key)) {
+            return messages.getString(key);
+        } else {
+            return "???key???";
+        }
+    }
+    
+    public String get(final String key) {
+        return getMessage(key);
+    }
+    
+    @Override
+    public Set<Entry<String, String>> entrySet() {
+        return messages
+            .keySet()
+            .stream()
+            .collect(
+                Collectors.toMap(key -> key, key-> messages.getString(key))
+            )
+            .entrySet();
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
index 57b5da792..0eb0e7f4a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
@@ -67,7 +67,7 @@ public class ApplicationsPage implements AdminPage {
 
     @Override
     public String getIcon() {
-        return "journals";
+        return "puzzle";
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
index 3b80c3df7..bab4b12cf 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
@@ -66,7 +66,7 @@ public class SitesPage implements AdminPage {
 
     @Override
     public String getIcon() {
-        return "bookshelf";
+        return "collection";
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
index bbc38465e..a85cd9521 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
@@ -23,7 +23,9 @@ import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.mvc.MvcContext;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
@@ -36,6 +38,9 @@ import javax.ws.rs.Path;
 @Path("/systeminformation")
 public class SystemInformationController {
     
+    @Inject
+    private MvcContext mvc; 
+    
     @GET
     @Path("/")
     @AuthorizationRequired
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml
index 367fdcefb..25c5db283 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml
@@ -4,13 +4,22 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
         <ui:param name="activePage" value="applications" />
-        <ui:param name="title" value="System Information" />
+        <ui:param name="title" value="#{AdminMessages['applications.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['applications.label']}
+            </li>
+        </ui:define>
+
         <ui:define name="main">
             <div class="container">
-                <h1>Applications</h1>
+                <h1>#{AdminMessages['applications.label']}</h1>
                 <p>Placeholder</p>
             </div>
         </ui:define>
+
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories.xhtml
index b7a561028..5c639f229 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories.xhtml
@@ -4,13 +4,22 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+        
         <ui:param name="activePage" value="categories" />
-        <ui:param name="title" value="Categories" />
+        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+    
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['categories.label']}
+            </li>
+        </ui:define>
+        
         <ui:define name="main">
             <div class="container">
-                <h1>Categories</h1>
+                <h1>#{AdminMessages['categories.label']}</h1>
                 <p>Placeholder</p>
             </div>
         </ui:define>
+    
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
index ec030cdf1..cd0d52d15 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
@@ -44,6 +44,16 @@
                     </ul>
                 </div>
             </nav>
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb">
+                    <li class="breadcrumb-item">
+                        <a href="#{request.contextPath}/@admin/">
+                            #{AdminMessages['breadcrumbs.start']}
+                        </a>
+                    </li>
+                    <ui:insert name="breadcrumb"></ui:insert>
+                </ol>
+            </nav>
         </header>
         <main>
             <ui:insert name="main"></ui:insert>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
index e96b95e44..2b3f210b2 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
@@ -4,13 +4,22 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+        
         <ui:param name="activePage" value="configuration" />
-        <ui:param name="title" value="Configuration" />
+        <ui:param name="title" value="#{AdminMessages['configuration.label']}" />
+    
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['configuration.label']}
+            </li>
+        </ui:define>
+        
         <ui:define name="main">
             <div class="container">
-                <h1>Configuration</h1>
+                <h1>#{AdminMessages['configuration.label']}</h1>
                 <p>Placeholder</p>
             </div>
         </ui:define>
+    
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
index b1d4b38ef..a77b8a7b7 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
@@ -4,13 +4,19 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+        
         <ui:param name="activePage" value="/" />
-        <ui:param name="title" value="Dashboard" />
+        <ui:param name="title" value="#{AdminMessages['dashboard.label']}" />
+        
+        <ui:define name="breadcrumb">
+        </ui:define>
+        
         <ui:define name="main">
             <div class="container">
-                <h1>LibreCCM Admin Dashboard</h1>
+                <h1>#{AdminMessages['dashboard.label']}</h1>
                 <p>Placeholder</p>
             </div>
         </ui:define>
+    
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport.xhtml
index 76b0e2744..0910af948 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport.xhtml
@@ -4,13 +4,22 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
         <ui:param name="activePage" value="imexport" />
-        <ui:param name="title" value="Import/Export" />
+        <ui:param name="title" value="#{AdminMessages['imexport.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['imexport.label']}
+            </li>
+        </ui:define>
+
         <ui:define name="main">
             <div class="container">
-                <h1>Import/Export</h1>
+                <h1>#{AdminMessages['imexport.label']}</h1>
                 <p>Placeholder</p>
             </div>
         </ui:define>
+
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites.xhtml
index 8747255cc..9ed2f5fc9 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites.xhtml
@@ -4,13 +4,23 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
         <ui:param name="activePage" value="sites" />
-        <ui:param name="title" value="Sites" />
+        <ui:param name="title" value="#{AdminMessages['sites.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['sites.label']}
+            </li>
+        </ui:define>
+
+
         <ui:define name="main">
             <div class="container">
-                <h1>Sites</h1>
+                <h1>#{AdminMessages['sites.label']}</h1>
                 <p>Placeholder</p>
             </div>
         </ui:define>
+
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
index 1135e06c9..e4fd53b3d 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/systeminformation.xhtml
@@ -4,11 +4,21 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
         <ui:param name="activePage" value="systeminformation" />
-        <ui:param name="title" value="System Information" />
+        <ui:param name="title" 
+                  value="#{AdminMessages['systeminformation.label']}" 
+                  />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['systeminformation.label']}
+            </li>
+        </ui:define>
+
         <ui:define name="main">
             <div class="container">
-                <h1>System Information</h1>
+                <h1>#{AdminMessages['systeminformation.label']}</h1>
                 <ul class="nav nav-tabs" 
                     id="systeminformation-tabs" 
                     role="tablist">
@@ -20,7 +30,7 @@
                            role="tab"
                            aria-controls="ccminfo"
                            aria-selected="true">
-                            LibreCCM System Information
+                            #{AdminMessages['systeminformation.tabs.libreccm.label']}
                         </a>
                     </li>
                     <li class="nav-item" role="presentation">
@@ -31,7 +41,7 @@
                            role="tab"
                            aria-controls="javainfo"
                            aria-selected="false">
-                            Java System Properties
+                            #{AdminMessages['systeminformation.tabs.java.label']}
                         </a>
                     </li>
                 </ul>
@@ -42,7 +52,7 @@
                          role="tabpanel"
                          aria-labelled="LibreCCM System Information Tab"
                          >
-                        <h2>LibreCCM System Information</h2>
+                        <h2>AdminMessages['systeminformation.tabs.libreccm.label']</h2>
                         <dl>
                             <c:forEach items="#{SystemInformationModel.ccmSystemInformation}" 
                                        var="prop">
@@ -58,7 +68,7 @@
                          role="tabpanel"
                          aria-labelled="Java System Properties Tab"
                          >
-                        <h2>Java System Properties</h2>
+                        <h2>#{AdminMessages['systeminformation.tabs.java.label']}</h2>
                         <dl>
                             <c:forEach items="#{SystemInformationModel.javaSystemProperties}" 
                                        var="prop">
@@ -70,23 +80,6 @@
                         </dl>
                     </div>
                 </div>
-<!--                
-                <ul class="nav nav-tabs" id="myTab" role="tablist">
-  <li class="nav-item" role="presentation">
-    <a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Home</a>
-  </li>
-  <li class="nav-item" role="presentation">
-    <a class="nav-link" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">Profile</a>
-  </li>
-  <li class="nav-item" role="presentation">
-    <a class="nav-link" id="contact-tab" data-toggle="tab" href="#contact" role="tab" aria-controls="contact" aria-selected="false">Contact</a>
-  </li>
-</ul>
-<div class="tab-content" id="myTabContent">
-  <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">...</div>
-  <div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">...</div>
-  <div class="tab-pane fade" id="contact" role="tabpanel" aria-labelledby="contact-tab">...</div>
-</div>-->
             </div>
         </ui:define>
     </ui:composition>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
index 984c6243a..426afd3b2 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
@@ -4,13 +4,22 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
         <ui:param name="activePage" value="usersgroupsroles" />
-        <ui:param name="title" value="Users/Groups/Roles" />
+        <ui:param name="title" value="#{AdminMessages['usersgroupsroles.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['usersgroupsroles.label']}
+            </li>
+        </ui:define>
+
         <ui:define name="main">
             <div class="container">
-                <h1>Users/Groups/Roles</h1>
+                <h1>#{AdminMessages['usersgroupsroles.label']}</h1>
                 <p>Placeholder</p>
             </div>
         </ui:define>
+
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 3242d3205..8edd74f1b 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -14,3 +14,6 @@ sites.label=Sites
 sites.description=Manage sites
 usersgroupsroles.label=Users/Groups/Roles
 usersgroupsroles.description=Manage users, groups and roles
+systeminformation.tabs.libreccm.label=LibreCCM System Information
+systeminformation.tabs.java.label=Java System Properties
+breadcrumbs.start=LibreCCM Admin
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 1ffeb074a..7f68a543e 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -5,7 +5,7 @@ applications.description=Verwalten der Anwendungsinstanzen
 imexport.label=Import/Export
 categories.label=Kategorien
 categories.description=Verwaltung der Kategorien
-configuration.label=Configuration
+configuration.label=Konfguration
 configuration.description=Bearbeiten der Konfiguration
 dashboard.label=Dashboard
 dashboard.description=Provides access to all applications
@@ -14,3 +14,6 @@ sites.label=Sites
 sites.description=Sites verwalten
 usersgroupsroles.label=Benutzer*innen/Gruppen/Rollen
 usersgroupsroles.description=Verwaltungen von Benutzer*innen, Gruppen und Rollen
+systeminformation.tabs.libreccm.label=LibreCCM System Informationen
+systeminformation.tabs.java.label=Java System Properties
+breadcrumbs.start=LibreCCM Admin

From 917849e62298ded7fd57d51d42898d2a4756b291 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 23 Sep 2020 20:41:00 +0200
Subject: [PATCH 07/93] Table of users

---
 .gitignore                                    |   1 +
 .../libreccm/ui/admin/AdminPagesModel.java    |  30 ++++-
 .../admin/usersgroupsroles/OverviewModel.java |  90 ++++++++++++++
 .../UsersGroupsRolesController.java           |  42 ++++++-
 .../usersgroupsroles/UsersTableModel.java     |  66 +++++++++++
 .../ui/admin/users-groups-roles.xhtml         |  45 +++++--
 .../ui/admin/users-groups-roles/groups.xhtml  |  26 +++++
 .../admin/users-groups-roles/overview.xhtml   |  24 ++++
 .../ui/admin/users-groups-roles/roles.xhtml   |  26 +++++
 .../ui/admin/users-groups-roles/users.xhtml   | 110 ++++++++++++++++++
 .../org/libreccm/ui/AdminBundle.properties    |  21 ++++
 .../org/libreccm/ui/AdminBundle_de.properties |  21 ++++
 12 files changed, 482 insertions(+), 20 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/OverviewModel.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersTableModel.java
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/overview.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml

diff --git a/.gitignore b/.gitignore
index 56e4e14b7..144b13113 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ target
 .settings
 .tscache
 *.vscode
+/ccm-core/nbproject/
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
index 0335d7b32..72f07e4df 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
@@ -20,7 +20,9 @@ package org.libreccm.ui.admin;
 
 import org.libreccm.l10n.GlobalizationHelper;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.stream.Collectors;
 
@@ -43,6 +45,11 @@ public class AdminPagesModel {
     @Inject
     private GlobalizationHelper globalizationHelper;
 
+    /**
+     * Cache for bundles
+     */
+    private final Map<String, ResourceBundle> bundles = new HashMap<>();
+
     public List<AdminPageModel> getAdminPages() {
         return adminPages
             .stream()
@@ -56,13 +63,11 @@ public class AdminPagesModel {
     }
 
     private AdminPageModel buildAdminPageModel(final AdminPage fromAdminPage) {
-        final ResourceBundle labelBundle = ResourceBundle.getBundle(
-            fromAdminPage.getLabelBundle(),
-            globalizationHelper.getNegotiatedLocale()
+        final ResourceBundle labelBundle = getBundle(
+            fromAdminPage.getLabelBundle()
         );
-        final ResourceBundle descriptionBundle = ResourceBundle.getBundle(
-            fromAdminPage.getDescriptionBundle(),
-            globalizationHelper.getNegotiatedLocale()
+        final ResourceBundle descriptionBundle = getBundle(
+            fromAdminPage.getDescriptionBundle()
         );
 
         final AdminPageModel model = new AdminPageModel();
@@ -77,4 +82,17 @@ public class AdminPagesModel {
         return model;
     }
 
+    private ResourceBundle getBundle(final String bundleName) {
+        if (bundles.containsKey(bundleName)) {
+            return bundles.get(bundleName);
+        } else {
+            final ResourceBundle bundle =  ResourceBundle.getBundle(
+                bundleName,
+                globalizationHelper.getNegotiatedLocale()
+            );
+            bundles.put(bundleName, bundle);
+            return bundle;
+        }
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/OverviewModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/OverviewModel.java
new file mode 100644
index 000000000..52d958648
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/OverviewModel.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.GroupRepository;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.RoleRepository;
+import org.libreccm.security.UserRepository;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.transaction.Transactional;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("UsersGroupsRolesOverviewModel")
+public class OverviewModel {
+
+    @Inject
+    private GroupRepository groupRepository;
+
+    @Inject
+    private RoleRepository roleRepository;
+
+    @Inject
+    private UserRepository userRepository;
+
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional
+    public long getActiveUsersCount() {
+        return userRepository
+            .findAll()
+            .stream()
+            .filter(user -> !user.isBanned())
+            .count();
+    }
+
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional
+    public long getDisabledUsersCount() {
+        return userRepository
+            .findAll()
+            .stream()
+            .filter(user -> user.isBanned())
+            .count();
+    }
+
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional
+    public long getGroupsCount() {
+        return groupRepository
+            .findAll()
+            .size();
+    }
+
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional
+    public long getRolesCount() {
+        return roleRepository
+            .findAll()
+            .size();
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
index 6cfe77e65..69dd1d61e 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
@@ -23,9 +23,14 @@ import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
 
 /**
  *
@@ -35,12 +40,43 @@ import javax.ws.rs.Path;
 @Controller
 @Path("/users-groups-roles")
 public class UsersGroupsRolesController {
-    
+
+    @Inject
+    private UsersTableModel usersTableModel;
+
     @GET
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getPlaceholder() {
-        return "org/libreccm/ui/admin/users-groups-roles.xhtml";
+    public String getOverview() {
+        return "org/libreccm/ui/admin/users-groups-roles/overview.xhtml";
     }
+
+    @GET
+    @Path("/groups")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getGroups() {
+        return "org/libreccm/ui/admin/users-groups-roles/groups.xhtml";
+    }
+
+    @GET
+    @Path("/roles")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getRoles() {
+        return "org/libreccm/ui/admin/users-groups-roles/roles.xhtml";
+    }
+
+    @GET
+    @Path("/users")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getUsers(
+        @QueryParam("filterterm") @DefaultValue("") final String filterTerm
+    ) {
+        usersTableModel.setFilterTerm(filterTerm);
+        return "org/libreccm/ui/admin/users-groups-roles/users.xhtml";
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersTableModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersTableModel.java
new file mode 100644
index 000000000..e6a0b9c82
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersTableModel.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.User;
+import org.libreccm.security.UserRepository;
+
+import java.util.List;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.transaction.Transactional;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("UsersTableModel")
+public class UsersTableModel {
+
+    @Inject
+    private UserRepository userRepository;
+
+    private String filterTerm;
+
+    public String getFilterTerm() {
+        return filterTerm;
+    }
+
+    protected void setFilterTerm(final String filterTerm) {
+        this.filterTerm = filterTerm;
+    }
+
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional
+    public List<User> getUsers() {
+        if (filterTerm == null || filterTerm.isEmpty()) {
+            return userRepository.findAllOrderdByUsername();
+        } else {
+            return userRepository.filtered(filterTerm);
+        }
+    }
+
+}
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
index 426afd3b2..2ddb572ad 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
@@ -5,19 +5,42 @@
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
-        <ui:param name="activePage" value="usersgroupsroles" />
-        <ui:param name="title" value="#{AdminMessages['usersgroupsroles.label']}" />
-
-        <ui:define name="breadcrumb">
-            <li class="breadcrumb-item active">
-                #{AdminMessages['usersgroupsroles.label']}
-            </li>
-        </ui:define>
+        <!--        <ui:param name="activePage" value="usersgroupsroles" />
+                <ui:param name="title" value="#{AdminMessages['usersgroupsroles.label']}" />
+        
+                <ui:define name="breadcrumb">
+                    <li class="breadcrumb-item active">
+        #{AdminMessages['usersgroupsroles.label']}
+    </li>
+</ui:define>-->
 
         <ui:define name="main">
-            <div class="container">
-                <h1>#{AdminMessages['usersgroupsroles.label']}</h1>
-                <p>Placeholder</p>
+            <div class="container-fluid mx-1">
+
+                <div class="row">
+                    <nav class="col-md-2 list-group">
+                        <a class="list-group-item list-group-item-action #{activePanel == 'overview' ? 'active' : ''}" 
+                           href="#{request.contextPath}/@admin/users-groups-roles">
+                            #{AdminMessages['usersgroupsroles.overview.label']}
+                        </a>
+                        <a class="list-group-item list-group-item-action #{activePanel == 'users' ? 'active' : ''}" 
+                           href="#{request.contextPath}/@admin/users-groups-roles/users">
+                            #{AdminMessages['usersgroupsroles.users.label']}
+                        </a>
+                        <a class="list-group-item list-group-item-action #{activePanel == 'groups' ? 'active' : ''}" 
+                           href="#{request.contextPath}/@admin/users-groups-roles/groups">
+                            #{AdminMessages['usersgroupsroles.groups.label']}
+                        </a>
+                        <a class="list-group-item list-group-item-action #{activePanel == 'roles' ? 'active' : ''}" 
+                           href="#{request.contextPath}/@admin/users-groups-roles/roles">
+                            #{AdminMessages['usersgroupsroles.roles.label']}
+                        </a>
+                    </nav>
+                    <div class="col-md-10">
+                        <h1>#{title}</h1>
+                        <ui:insert name="panel"></ui:insert>
+                    </div>
+                </div>
             </div>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
new file mode 100644
index 000000000..8029a7ff7
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="groups" />
+        <ui:param name="title" 
+                  value="#{AdminMessages['usersgroupsroles.groups.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{request.contextPath}/@admin/users-groups-roles/">#{AdminMessages['usersgroupsroles.label']}</a>
+            </li>
+            <li class="breadcrumb-item active">
+                #{AdminMessages['usersgroupsroles.groups.label']}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <p>Groups placeholder</p>
+        </ui:define>
+    </ui:composition>
+</html>
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/overview.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/overview.xhtml
new file mode 100644
index 000000000..1a3df4cff
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/overview.xhtml
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="overview" />
+        <ui:param name="title" value="#{AdminMessages['usersgroupsroles.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['usersgroupsroles.label']}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <p>#{UsersGroupsRolesOverviewModel.activeUsersCount} #{AdminMessages['usersgroupsroles.active_users_count.label']}</p>
+            <p>#{UsersGroupsRolesOverviewModel.disabledUsersCount} #{AdminMessages['usersgroupsroles.disabled_users_count.label']}</p>
+            <p>#{UsersGroupsRolesOverviewModel.groupsCount} #{AdminMessages['usersgroupsroles.groups_count.label']}</p>
+            <p>#{UsersGroupsRolesOverviewModel.rolesCount} #{AdminMessages['usersgroupsroles.roles_count.label']}</p>
+        </ui:define>
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
new file mode 100644
index 000000000..26bdf61c6
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="roles" />
+        <ui:param name="title" 
+                  value="#{AdminMessages['usersgroupsroles.roles.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{request.contextPath}/@admin/users-groups-roles/">#{AdminMessages['usersgroupsroles.label']}</a>
+            </li>
+            <li class="breadcrumb-item active">
+                #{AdminMessages['usersgroupsroles.roles.label']}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <p>Roles placeholder</p>
+        </ui:define>
+    </ui:composition>
+</html>
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
new file mode 100644
index 000000000..58222e0e4
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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">
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="users" />
+        <ui:param name="title" 
+                  value="#{AdminMessages['usersgroupsroles.users.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{request.contextPath}/@admin/users-groups-roles/">#{AdminMessages['usersgroupsroles.label']}</a>
+            </li>
+            <li class="breadcrumb-item active">
+                #{AdminMessages['usersgroupsroles.users.label']}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <div class="row mb-2">
+                <div class="col-sm-9">
+                    <form action="#{request.contextPath}/@admin/users-groups-roles/users" 
+                          class="form-inline" 
+                          method="get">
+                        <div class="form-group">
+                            <label class="mr-2" for="filter-term">
+                                #{AdminMessages['usersgroupsroles.users.filter.label']}
+                            </label>
+                            <input class="form-control" 
+                                   id="filter-term" 
+                                   name="filterterm"
+                                   type="text" 
+                                   value="#{UsersTableModel.filterTerm}"/>
+                        </div>
+                        <button class="btn btn-secondary ml-1" type="submit">
+                            #{AdminMessages['usersgroupsroles.users.filter.submit']}
+                        </button>
+                    </form>
+                </div>
+                <div class="col-sm-3 text-right">
+                    <a class="btn btn-secondary" href="#">
+                        <svg class="bi"
+                             width="1em"
+                             height="1em"
+                             fill="currentColor">
+                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#person-plus" />
+                        </svg>
+                        <span>#{AdminMessages['usersgroupsroles.users.add']}</span>
+                    </a>
+                </div>
+            </div>
+            <table class="table table-hover users-table">
+                <thead class="thead-light">
+                    <tr>
+                        <th>#{AdminMessages['usersgroupsroles.users.table.headers.username']}</th>
+                        <th>#{AdminMessages['usersgroupsroles.users.table.headers.givenname']}</th>
+                        <th>#{AdminMessages['usersgroupsroles.users.table.headers.familyname']}</th>
+                        <th>#{AdminMessages['usersgroupsroles.users.table.headers.email']}</th>
+                        <th class="text-center">#{AdminMessages['usersgroupsroles.users.table.headers.disabled']}</th>
+                        <th class="text-center" colspan="2">#{AdminMessages['usersgroupsroles.users.table.headers.actions']}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <c:forEach items="#{UsersTableModel.users}" var="user">
+                        <tr>
+                            <td>#{user.name}</td>
+                            <td>#{user.givenName}</td>
+                            <td>#{user.familyName}</td>
+                            <td>
+                                #{user.primaryEmailAddress.address}
+                            </td>
+                            <td class="text-center">
+                                #{user.banned ? AdminMessages['usersgroupsroles.users.table.headers.disabled.true'] : AdminMessages['usersgroupsroles.users.table.headers.disabled.false']}
+                            </td>
+                            <td class="text-center action-col">
+                                <a class="btn btn-info" href="#">
+                                    <svg class="bi"
+                                         width="1em"
+                                         height="1em"
+                                         fill="currentColor">
+                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#eye" />
+                                    </svg>
+                                    <span>#{AdminMessages['usersgroupsroles.users.detailslink.label']}
+                                    </span>
+                                </a>
+                            </td>
+                            <td class="text-center action-col">
+                                <button class="btn btn-danger">
+                                    <svg class="bi"
+                                         width="1em"
+                                         height="1em"
+                                         fill="currentColor">
+                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#person-x" />
+                                    </svg>
+                                    <span>
+                                        #{AdminMessages['usersgroupsroles.users.disablebutton.label']}
+                                    </span>
+                                </button>
+                            </td>
+                        </tr>
+                    </c:forEach>
+                </tbody>
+            </table>
+        </ui:define>
+    </ui:composition>
+</html>
+
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 8edd74f1b..d7384ddd0 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -17,3 +17,24 @@ usersgroupsroles.description=Manage users, groups and roles
 systeminformation.tabs.libreccm.label=LibreCCM System Information
 systeminformation.tabs.java.label=Java System Properties
 breadcrumbs.start=LibreCCM Admin
+usersgroupsroles.users.label=Users
+usersgroupsroles.groups.label=Groups
+usersgroupsroles.roles.label=Roles
+usersgroupsroles.overview.label=Overview
+usersgroupsroles.active_users_count.label=active users
+usersgroupsroles.disabled_users_count.label=disabled users
+usersgroupsroles.groups_count.label=groups
+usersgroupsroles.roles_count.label=roles
+usersgroupsroles.users.table.headers.username=User Name
+usersgroupsroles.users.table.headers.givenname=Given Name
+usersgroupsroles.users.table.headers.familyname=Family Name
+usersgroupsroles.users.table.headers.email=Email
+usersgroupsroles.users.table.headers.disabled=Disabled?
+usersgroupsroles.users.table.headers.actions=Actions
+usersgroupsroles.users.table.headers.disabled.true=Yes
+usersgroupsroles.users.table.headers.disabled.false=No
+usersgroupsroles.users.detailslink.label=Details
+usersgroupsroles.users.disablebutton.label=Disable
+usersgroupsroles.users.add=Add user
+usersgroupsroles.users.filter.label=Filter users
+usersgroupsroles.users.filter.submit=Submit
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 7f68a543e..f8baca984 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -17,3 +17,24 @@ usersgroupsroles.description=Verwaltungen von Benutzer*innen, Gruppen und Rollen
 systeminformation.tabs.libreccm.label=LibreCCM System Informationen
 systeminformation.tabs.java.label=Java System Properties
 breadcrumbs.start=LibreCCM Admin
+usersgroupsroles.users.label=Benutzer*innen
+usersgroupsroles.groups.label=Gruppen
+usersgroupsroles.roles.label=Rollen
+usersgroupsroles.overview.label=\u00dcberblick
+usersgroupsroles.active_users_count.label=aktive Benutzer*innen
+usersgroupsroles.disabled_users_count.label=inaktive Benutzer*innen
+usersgroupsroles.groups_count.label=Gruppen
+usersgroupsroles.roles_count.label=Rollen
+usersgroupsroles.users.table.headers.username=Benutzername
+usersgroupsroles.users.table.headers.givenname=Vorname
+usersgroupsroles.users.table.headers.familyname=Familienname
+usersgroupsroles.users.table.headers.email=E-Mail
+usersgroupsroles.users.table.headers.disabled=Inaktiv?
+usersgroupsroles.users.table.headers.actions=Aktionen
+usersgroupsroles.users.table.headers.disabled.true=Ja
+usersgroupsroles.users.table.headers.disabled.false=Nein
+usersgroupsroles.users.detailslink.label=Details
+usersgroupsroles.users.disablebutton.label=Sperren
+usersgroupsroles.users.add=Benutzer*in hinzuf\u00fcgen
+usersgroupsroles.users.filter.label=Benutzer*innen filtern
+usersgroupsroles.users.filter.submit=Anwenden

From aed845570b770e19dc00cc06b88b4ad6ce1c1c23 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 23 Sep 2020 21:13:04 +0200
Subject: [PATCH 08/93] Changed order of admin pages to get the mosted used one
 the left most position

---
 .../org/libreccm/ui/admin/applications/ApplicationsPage.java | 2 +-
 .../java/org/libreccm/ui/admin/imexport/ImExportPage.java    | 4 +---
 .../src/main/java/org/libreccm/ui/admin/sites/SitesPage.java | 2 +-
 .../ui/admin/usersgroupsroles/UsersGroupsRolesPage.java      | 5 ++---
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
index 0eb0e7f4a..cedd9abc6 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
@@ -72,7 +72,7 @@ public class ApplicationsPage implements AdminPage {
 
     @Override
     public int getPosition() {
-        return 10;
+        return 40;
     }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
index d97224905..4c758bd0e 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
@@ -18,10 +18,8 @@
  */
 package org.libreccm.ui.admin.imexport;
 
-import org.libreccm.ui.admin.configuration.*;
 import org.libreccm.ui.admin.AdminConstants;
 import org.libreccm.ui.admin.AdminPage;
-import org.libreccm.ui.admin.categories.CategoriesController;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -73,6 +71,6 @@ public class ImExportPage implements AdminPage {
 
     @Override
     public int getPosition() {
-        return 40;
+        return 60;
     }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
index bab4b12cf..ae42934e7 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
@@ -71,6 +71,6 @@ public class SitesPage implements AdminPage {
 
     @Override
     public int getPosition() {
-        return 60;
+        return 50;
     }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
index 1800ba090..4212574cb 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
@@ -18,10 +18,8 @@
  */
 package org.libreccm.ui.admin.usersgroupsroles;
 
-import org.libreccm.ui.admin.configuration.*;
 import org.libreccm.ui.admin.AdminConstants;
 import org.libreccm.ui.admin.AdminPage;
-import org.libreccm.ui.admin.categories.CategoriesController;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -38,6 +36,7 @@ public class UsersGroupsRolesPage implements AdminPage {
     public Set<Class<?>> getControllerClasses() {
         final Set<Class<?>> classes = new HashSet<>();
         classes.add(UsersGroupsRolesController.class);
+        classes.add(UsersController.class);
         return classes;
     }
 
@@ -73,6 +72,6 @@ public class UsersGroupsRolesPage implements AdminPage {
 
     @Override
     public int getPosition() {
-        return 80;
+        return 10;
     }
 }

From 6ebb1aed5396dcf862ba7f7537b58256058070b2 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 23 Sep 2020 21:13:41 +0200
Subject: [PATCH 09/93] Moved controller methods for users administration to
 separate controller

---
 .../usersgroupsroles/UsersController.java     | 146 ++++++++++++++++++
 .../UsersGroupsRolesController.java           |  21 +--
 2 files changed, 149 insertions(+), 18 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
new file mode 100644
index 000000000..ad6f27a62
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/users-groups-roles/users")
+public class UsersController {
+
+    @Inject
+    private UsersTableModel usersTableModel;
+
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getUsers(
+        @QueryParam("filterterm") @DefaultValue("") final String filterTerm
+    ) {
+        usersTableModel.setFilterTerm(filterTerm);
+        return "org/libreccm/ui/admin/users-groups-roles/users.xhtml";
+    }
+
+    @GET
+    @Path("/{userIdentifier}/details")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getUser(
+        @PathParam("userIdentifier") final String userIdentifier
+    ) {
+
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{userIdentifier}/create")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String createUser(
+        @PathParam("userIdentifier") final String userIdentifier
+    ) {
+
+        throw new UnsupportedOperationException();
+    }
+
+    @GET
+    @Path("/users/{userIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String editUser(
+        @PathParam("userIdentifier") final String userIdentifier
+    ) {
+
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/users/{userIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String updateUser(
+        @PathParam("userIdentifier") final String userIdentifier
+    ) {
+
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/users/{userIdentifier}/disable")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String disableUser(
+        @PathParam("userIdentifier") final String userIdentifier
+    ) {
+
+        throw new UnsupportedOperationException();
+    }
+
+    @GET
+    @Path("/{userIdentifier}/emailaddresses")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getEmailAddressesOfUser(
+        @PathParam("userIdentifier") final String userIdentifier
+    ) {
+
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{userIdentifier}/emailaddresses/{address}/add")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String addEmailAddresses(
+        @PathParam("userIdentifier") final String userIdentifier,
+        @PathParam("address") final String addressToAdd
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{userIdentifier}/emailaddresses/{address}/remove")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String removeEmailAddresses(
+        @PathParam("userIdentifier") final String userIdentifier,
+        @PathParam("address") final String addressToRemove
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
index 69dd1d61e..a61c9f4b2 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
@@ -23,14 +23,9 @@ import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
 import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
 import javax.mvc.Controller;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
-import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
 
 /**
  *
@@ -41,9 +36,7 @@ import javax.ws.rs.QueryParam;
 @Path("/users-groups-roles")
 public class UsersGroupsRolesController {
 
-    @Inject
-    private UsersTableModel usersTableModel;
-
+  
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -68,15 +61,7 @@ public class UsersGroupsRolesController {
         return "org/libreccm/ui/admin/users-groups-roles/roles.xhtml";
     }
 
-    @GET
-    @Path("/users")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getUsers(
-        @QueryParam("filterterm") @DefaultValue("") final String filterTerm
-    ) {
-        usersTableModel.setFilterTerm(filterTerm);
-        return "org/libreccm/ui/admin/users-groups-roles/users.xhtml";
-    }
+    
 
+    
 }

From 29a567f4485a2d7d87d1c1fd46f6286643f75dda Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 24 Sep 2020 21:13:57 +0200
Subject: [PATCH 10/93] User Details view and some other enhancements for the
 Admin UI

---
 .../java/org/libreccm/api/ApiConstants.java   |  35 ++
 .../java/org/libreccm/api/Identifier.java     |  46 +++
 .../org/libreccm/api/IdentifierParser.java    |  51 +++
 .../java/org/libreccm/api/IdentifierType.java |  29 ++
 .../java/org/libreccm/core/EmailAddress.java  |   4 +-
 .../main/java/org/libreccm/ui/Message.java    |  44 +++
 .../java/org/libreccm/ui/MessageType.java     |  36 +++
 .../org/libreccm/ui/admin/AdminMessages.java  |  28 +-
 .../java/org/libreccm/ui/admin/AdminPage.java |  18 +-
 .../org/libreccm/ui/admin/AdminPageModel.java |  16 +-
 .../libreccm/ui/admin/AdminPagesModel.java    |   2 +-
 .../applications/ApplicationsController.java  |   2 +-
 .../admin/applications/ApplicationsPage.java  |   6 +-
 .../categories/CategoriesController.java      |   2 +-
 .../ui/admin/categories/CategoriesPage.java   |   6 +-
 .../ConfigurationController.java              |   2 +-
 .../configuration/ConfigurationPage.java      |   7 +-
 .../admin/dashboard/DashboardController.java  |   2 +-
 .../ui/admin/dashboard/DashboardPage.java     |   7 +-
 .../ui/admin/imexport/ImExportController.java |   2 +-
 .../ui/admin/imexport/ImExportPage.java       |   6 +-
 .../ui/admin/sites/SitesController.java       |   2 +-
 .../libreccm/ui/admin/sites/SitesPage.java    |   6 +-
 .../SystemInformationPage.java                |   8 +-
 .../usersgroupsroles/GroupsController.java    |  47 +++
 .../usersgroupsroles/PartyRoleMembership.java |  74 +++++
 .../usersgroupsroles/RolesController.java     |  47 +++
 .../usersgroupsroles/UserDetailsModel.java    | 156 +++++++++
 .../usersgroupsroles/UserGroupMembership.java |  74 +++++
 .../usersgroupsroles/UsersController.java     |  63 +++-
 .../UsersGroupsRolesController.java           |  20 --
 .../UsersGroupsRolesPage.java                 |  15 +-
 .../org/libreccm/ui/admin/ccm-admin.xhtml     |   6 +-
 .../ui/admin/users-groups-roles.xhtml         |   8 +-
 .../ui/admin/users-groups-roles/groups.xhtml  |   4 +-
 .../ui/admin/users-groups-roles/roles.xhtml   |   4 +-
 .../users-groups-roles/user-details.xhtml     | 298 ++++++++++++++++++
 .../users-groups-roles/user-not-found.xhtml   |  39 +++
 .../ui/admin/users-groups-roles/users.xhtml   |  12 +-
 .../org/libreccm/ui/AdminBundle.properties    |  32 ++
 .../org/libreccm/ui/AdminBundle_de.properties |  32 ++
 41 files changed, 1212 insertions(+), 86 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/api/ApiConstants.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/api/Identifier.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/api/IdentifierType.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/Message.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/MessageType.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/PartyRoleMembership.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/api/ApiConstants.java b/ccm-core/src/main/java/org/libreccm/api/ApiConstants.java
new file mode 100644
index 000000000..b8e5c7d09
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/api/ApiConstants.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.api;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public final class ApiConstants {
+
+    private ApiConstants() {
+        // Nothing
+    }
+
+    public static final String IDENTIFIER_PREFIX_ID = "ID-";
+
+    public static final String IDENTIFIER_PREFIX_UUID = "UUID-";
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/api/Identifier.java b/ccm-core/src/main/java/org/libreccm/api/Identifier.java
new file mode 100644
index 000000000..319ce1021
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/api/Identifier.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.api;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class Identifier {
+
+    private final IdentifierType type;
+
+    private final String identifier;
+
+    protected Identifier(
+        final IdentifierType type, final String identifier
+    ) {
+        this.type = type;
+        this.identifier = identifier;
+    }
+
+    public IdentifierType getType() {
+        return type;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java b/ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java
new file mode 100644
index 000000000..5919eea24
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.api;
+
+import java.util.Objects;
+
+import javax.enterprise.context.Dependent;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@Dependent
+public class IdentifierParser {
+
+    public Identifier parseIdentifier(final String identifierParam) {
+        Objects.requireNonNull(identifierParam, "identifier param is null.");
+
+        if (identifierParam.startsWith(ApiConstants.IDENTIFIER_PREFIX_ID)) {
+            final String identifier = identifierParam
+                .substring(ApiConstants.IDENTIFIER_PREFIX_ID.length());
+            return new Identifier(IdentifierType.ID, identifier);
+        } else if (identifierParam.startsWith(
+            ApiConstants.IDENTIFIER_PREFIX_UUID)) {
+            final String identifier = identifierParam
+                .substring(ApiConstants.IDENTIFIER_PREFIX_UUID.length());
+            return new Identifier(IdentifierType.ID, identifier);
+        } else {
+            return new Identifier(
+                IdentifierType.PROPERTY, identifierParam
+            );
+        }
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/api/IdentifierType.java b/ccm-core/src/main/java/org/libreccm/api/IdentifierType.java
new file mode 100644
index 000000000..eaf85737b
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/api/IdentifierType.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.api;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public enum IdentifierType {
+    ID,
+    UUID,
+    PROPERTY
+}
diff --git a/ccm-core/src/main/java/org/libreccm/core/EmailAddress.java b/ccm-core/src/main/java/org/libreccm/core/EmailAddress.java
index 3d012d596..c5dcfbdd6 100644
--- a/ccm-core/src/main/java/org/libreccm/core/EmailAddress.java
+++ b/ccm-core/src/main/java/org/libreccm/core/EmailAddress.java
@@ -18,8 +18,6 @@
  */
 package org.libreccm.core;
 
-import org.hibernate.validator.constraints.Email;
-import org.hibernate.validator.constraints.NotBlank;
 
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
@@ -33,6 +31,8 @@ import static org.libreccm.core.CoreConstants.CORE_XML_NS;
 
 import javax.json.Json;
 import javax.json.JsonObjectBuilder;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
 
 /**
  * An embeddable entity for storing email addresses.
diff --git a/ccm-core/src/main/java/org/libreccm/ui/Message.java b/ccm-core/src/main/java/org/libreccm/ui/Message.java
new file mode 100644
index 000000000..916aa2b29
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/Message.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class Message {
+
+    private final String message;
+
+    private final MessageType messageType;
+
+    public Message(String message, MessageType messageType) {
+        this.message = message;
+        this.messageType = messageType;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public MessageType getMessageType() {
+        return messageType;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/MessageType.java b/ccm-core/src/main/java/org/libreccm/ui/MessageType.java
new file mode 100644
index 000000000..83f46f005
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/MessageType.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public enum MessageType {
+
+    PRIMARY,
+    SECONDARY,
+    SUCCESS,
+    DANGER,
+    WARNING,
+    INFO,
+    LIGHT,
+    DARK,
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java
index 6890af911..f0af45d4a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java
@@ -20,7 +20,9 @@ package org.libreccm.ui.admin;
 
 import org.libreccm.l10n.GlobalizationHelper;
 
+import java.text.MessageFormat;
 import java.util.AbstractMap;
+import java.util.List;
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -43,8 +45,6 @@ public class AdminMessages extends AbstractMap<String, String> {
 
     private ResourceBundle messages;
 
-    
-
     @PostConstruct
     private void init() {
         messages = ResourceBundle.getBundle(
@@ -57,21 +57,37 @@ public class AdminMessages extends AbstractMap<String, String> {
         if (messages.containsKey(key)) {
             return messages.getString(key);
         } else {
-            return "???key???";
+            return String.format("???%s???", key);
         }
     }
-    
+
+    public String getMessage(
+        final String key, final List<Object> parameters
+    ) {
+        return getMessage(key, parameters.toArray());
+    }
+
+    public String getMessage(
+        final String key, final Object[] parameters
+    ) {
+        if (messages.containsKey(key)) {
+            return MessageFormat.format(messages.getString(key), parameters);
+        } else {
+            return String.format("???%s???", key);
+        }
+    }
+
     public String get(final String key) {
         return getMessage(key);
     }
-    
+
     @Override
     public Set<Entry<String, String>> entrySet() {
         return messages
             .keySet()
             .stream()
             .collect(
-                Collectors.toMap(key -> key, key-> messages.getString(key))
+                Collectors.toMap(key -> key, key -> messages.getString(key))
             )
             .entrySet();
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
index 27e1ab4b4..9fcf96015 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
@@ -18,9 +18,10 @@
  */
 package org.libreccm.ui.admin;
 
-import java.util.ResourceBundle;
 import java.util.Set;
 
+import javax.mvc.MvcContext;
+
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@@ -35,14 +36,15 @@ public interface AdminPage {
     Set<Class<?>> getControllerClasses();
 
     /**
-     * The entry point for the admin module. Used to generate the URL for an
-     * admin page in the navigation etc. For example, with the return value will
-     * {@code systeminformation} the generated link is
-     * {@code #{contextPath}/@admin/#{path}}.
-     *
-     * @return The path fragment of the entry point of the admin page/module.
+     * A identifier to use by {@link MvcContext#uri(java.lang.String)} to
+     * generate the URI of the page. The identifier has the same format as used in JavaDoc:
+     * <pre>
+     *     ControllerSimpleClassName#methodName
+     * </pre>
+     * 
+     * @return The identifier to use for generating the URL of the page
      */
-    String getPath();
+    String getUriIdentifier();
 
     /**
      * Gets the resourcebundle which provides the label of the admin page.
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
index 706fa3342..96a7899d3 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
@@ -24,7 +24,7 @@ package org.libreccm.ui.admin;
  */
 public class AdminPageModel {
 
-    private String path;
+    private String uriIdentifier;
 
     private String label;
 
@@ -32,19 +32,19 @@ public class AdminPageModel {
 
     private String icon;
 
-    public String getPath() {
-        return path;
+    public String getUriIdentifier() {
+        return uriIdentifier;
     }
 
-    public void setPath(String path) {
-        this.path = path;
+    public void setUriIdentifier(final String uriIdentifier) {
+        this.uriIdentifier = uriIdentifier;
     }
 
     public String getLabel() {
         return label;
     }
 
-    public void setLabel(String label) {
+    public void setLabel(final String label) {
         this.label = label;
     }
 
@@ -52,7 +52,7 @@ public class AdminPageModel {
         return description;
     }
 
-    public void setDescription(String description) {
+    public void setDescription(final String description) {
         this.description = description;
     }
 
@@ -60,7 +60,7 @@ public class AdminPageModel {
         return icon;
     }
 
-    public void setIcon(String icon) {
+    public void setIcon(final String icon) {
         this.icon = icon;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
index 72f07e4df..08de0c083 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
@@ -71,7 +71,7 @@ public class AdminPagesModel {
         );
 
         final AdminPageModel model = new AdminPageModel();
-        model.setPath(fromAdminPage.getPath());
+        model.setUriIdentifier(fromAdminPage.getUriIdentifier());
         model.setLabel(labelBundle.getString(fromAdminPage.getLabelKey()));
         model.setDescription(
             descriptionBundle.getString(
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
index 5245c612a..0a9eff521 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
@@ -40,7 +40,7 @@ public class ApplicationsController {
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getPlaceholder() {
+    public String getApplications() {
         return "org/libreccm/ui/admin/applications.xhtml";
     }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
index cedd9abc6..185670232 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
@@ -41,8 +41,10 @@ public class ApplicationsPage implements AdminPage {
     }
 
     @Override
-    public String getPath() {
-        return "applications";
+    public String getUriIdentifier() {
+        return String.format(
+            "%s#getApplications", ApplicationsController.class.getSimpleName()
+        );
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
index e15766460..aebf65cf7 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
@@ -40,7 +40,7 @@ public class CategoriesController {
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getPlaceholder() {
+    public String getCategories() {
         return "org/libreccm/ui/admin/categories.xhtml";
     }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
index 666ac70e7..fa877b379 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
@@ -41,8 +41,10 @@ public class CategoriesPage implements AdminPage {
     }
 
     @Override
-    public String getPath() {
-        return "categories";
+    public String getUriIdentifier() {
+        return String.format(
+            "%s#getCategories", CategoriesController.class.getSimpleName()
+        );
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
index 1e36e66c6..e36f7fdc7 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
@@ -40,7 +40,7 @@ public class ConfigurationController {
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getPlaceholder() {
+    public String getSettings() {
         return "org/libreccm/ui/admin/configuration.xhtml";
     }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
index 463c136e6..d9ebcb039 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
@@ -20,7 +20,6 @@ package org.libreccm.ui.admin.configuration;
 
 import org.libreccm.ui.admin.AdminConstants;
 import org.libreccm.ui.admin.AdminPage;
-import org.libreccm.ui.admin.categories.CategoriesController;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -41,8 +40,10 @@ public class ConfigurationPage implements AdminPage {
     }
 
     @Override
-    public String getPath() {
-        return "configuration";
+    public String getUriIdentifier() {
+        return String.format(
+            "%s#getSettings", ConfigurationController.class.getSimpleName()
+        );
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java
index a3b72590b..d651b3453 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java
@@ -40,7 +40,7 @@ public class DashboardController {
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getPlaceholder() {
+    public String getDashboard() {
         return "org/libreccm/ui/admin/dashboard.xhtml";
     }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java
index 5620d3dd1..51276a54a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java
@@ -20,6 +20,7 @@ package org.libreccm.ui.admin.dashboard;
 
 import org.libreccm.ui.admin.AdminConstants;
 import org.libreccm.ui.admin.AdminPage;
+import org.libreccm.ui.admin.configuration.ConfigurationController;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -40,8 +41,10 @@ public class DashboardPage implements AdminPage {
     }
 
     @Override
-    public String getPath() {
-        return "/";
+    public String getUriIdentifier() {
+        return String.format(
+            "%s#getDashboard", DashboardController.class.getSimpleName()
+        );
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
index 9e2dfef7b..a89b01927 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
@@ -40,7 +40,7 @@ public class ImExportController {
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getPlaceholder() {
+    public String getImExportDashboard() {
         return "org/libreccm/ui/admin/imexport.xhtml";
     }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
index 4c758bd0e..e41b58555 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
@@ -40,8 +40,10 @@ public class ImExportPage implements AdminPage {
     }
 
     @Override
-    public String getPath() {
-        return "imexport";
+    public String getUriIdentifier() {
+         return String.format(
+            "%s#getImExportDashboard", ImExportController.class.getSimpleName()
+        );
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
index 817821f05..e7bd0a708 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
@@ -40,7 +40,7 @@ public class SitesController {
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getPlaceholder() {
+    public String getSites() {
         return "org/libreccm/ui/admin/sites.xhtml";
     }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
index ae42934e7..a07f98a6f 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
@@ -40,8 +40,10 @@ public class SitesPage implements AdminPage {
     }
 
     @Override
-    public String getPath() {
-        return "sites";
+    public String getUriIdentifier() {
+        return String.format(
+            "%s#getSites", SitesController.class.getSimpleName()
+        );
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
index 27af5ad63..bacaa0888 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
@@ -23,6 +23,7 @@ import java.util.Set;
 
 import org.libreccm.ui.admin.AdminConstants;
 import org.libreccm.ui.admin.AdminPage;
+import org.libreccm.ui.admin.imexport.ImExportController;
 
 import javax.enterprise.context.ApplicationScoped;
 
@@ -41,8 +42,11 @@ public class SystemInformationPage implements AdminPage {
     }
 
     @Override
-    public String getPath() {
-        return "systeminformation";
+    public String getUriIdentifier() {
+        return String.format(
+            "%s#getSystemInformation", 
+            SystemInformationController.class.getSimpleName()
+        );
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
new file mode 100644
index 000000000..5c9ddf910
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/users-groups-roles/group")
+public class GroupsController {
+
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getGroups() {
+        return "org/libreccm/ui/admin/users-groups-roles/groups.xhtml";
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/PartyRoleMembership.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/PartyRoleMembership.java
new file mode 100644
index 000000000..46cbaeec1
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/PartyRoleMembership.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.security.Role;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class PartyRoleMembership implements Comparable<PartyRoleMembership>{
+
+    private long roleId;
+
+    private String roleUuid;
+
+    private String roleName;
+
+    public PartyRoleMembership() {
+        // Nothing
+    }
+
+    public PartyRoleMembership(final Role role) {
+        roleId = role.getRoleId();
+        roleUuid = role.getUuid();
+        roleName = role.getName();
+    }
+
+    public long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(long roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getRoleUuid() {
+        return roleUuid;
+    }
+
+    public void setRoleUuid(String roleUuid) {
+        this.roleUuid = roleUuid;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+    @Override
+    public int compareTo(final PartyRoleMembership other) {
+        return roleName.compareTo(other.getRoleName());
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
new file mode 100644
index 000000000..2154649eb
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/users-groups-roles/roles")
+public class RolesController {
+
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getRoles() {
+        return "org/libreccm/ui/admin/users-groups-roles/roles.xhtml";
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
new file mode 100644
index 000000000..68b4a8a5a
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.core.EmailAddress;
+import org.libreccm.security.GroupMembership;
+import org.libreccm.security.RoleMembership;
+import org.libreccm.security.User;
+import org.libreccm.ui.Message;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+import javax.transaction.Transactional;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("UserDetailsModel")
+public class UserDetailsModel {
+
+    private long userId;
+
+    private String uuid;
+
+    private String name;
+
+    private String givenName;
+
+    private String familyName;
+
+    private EmailAddress primaryEmailAddress;
+
+    private List<EmailAddress> emailAddresses;
+
+    private boolean banned;
+
+    private boolean passwordResetRequired;
+
+    private List<UserGroupMembership> groupMemberships;
+
+    private List<PartyRoleMembership> roles;
+    
+    private final List<Message> messages;
+    
+    public UserDetailsModel() {
+        messages = new ArrayList<>();
+    }
+
+    @Transactional(Transactional.TxType.REQUIRED)
+    protected void setUser(final User user) {
+        Objects.requireNonNull(user);
+
+        userId = user.getPartyId();
+        uuid = user.getUuid();
+        name = user.getName();
+        givenName = user.getGivenName();
+        familyName = user.getFamilyName();
+        primaryEmailAddress = user.getPrimaryEmailAddress();
+        // Ensure that we don't get a lazyily initalized list.
+        emailAddresses = user
+            .getEmailAddresses()
+            .stream()
+            .collect(Collectors.toList());
+        banned = user.isBanned();
+        passwordResetRequired = user.isPasswordResetRequired();
+        groupMemberships = user
+            .getGroupMemberships()
+            .stream()
+            .map(GroupMembership::getGroup)
+            .map(UserGroupMembership::new)
+            .collect(Collectors.toList());
+        roles = user
+            .getRoleMemberships()
+            .stream()
+            .map(RoleMembership::getRole)
+            .map(PartyRoleMembership::new)
+            .collect(Collectors.toList());
+    }
+    
+    public List<Message> getMessages() {
+        return Collections.unmodifiableList(messages);
+    }
+    
+    public void addMessage(final Message message) {
+        messages.add(message);
+    }
+
+    public long getUserId() {
+        return userId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getGivenName() {
+        return givenName;
+    }
+
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    public EmailAddress getPrimaryEmailAddress() {
+        return primaryEmailAddress;
+    }
+
+    public List<EmailAddress> getEmailAddresses() {
+        return Collections.unmodifiableList(emailAddresses);
+    }
+
+    public boolean isBanned() {
+        return banned;
+    }
+
+    public boolean isPasswordResetRequired() {
+        return passwordResetRequired;
+    }
+
+    public List<UserGroupMembership> getGroupMemberships() {
+        return Collections.unmodifiableList(groupMemberships);
+    }
+
+    public List<PartyRoleMembership> getRoles() {
+        return Collections.unmodifiableList(roles);
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java
new file mode 100644
index 000000000..31b48b3aa
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.security.Group;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class UserGroupMembership implements Comparable<UserGroupMembership> {
+
+    private long groupId;
+
+    private String groupUuid;
+
+    private String groupName;
+
+    public UserGroupMembership() {
+        // Nothing
+    }
+
+    public UserGroupMembership(final Group group) {
+        this.groupId = group.getPartyId();
+        this.groupUuid = group.getUuid();
+        this.groupName = group.getName();
+    }
+
+    public long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(final long groupId) {
+        this.groupId = groupId;
+    }
+
+    public String getGroupUuid() {
+        return groupUuid;
+    }
+
+    public void setGroupUuid(final String groupUuid) {
+        this.groupUuid = groupUuid;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(final String groupName) {
+        this.groupName = groupName;
+    }
+
+    @Override
+    public int compareTo(final UserGroupMembership other) {
+        return groupName.compareTo(other.getGroupName());
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
index ad6f27a62..3b079f3e4 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
@@ -18,13 +18,24 @@
  */
 package org.libreccm.ui.admin.usersgroupsroles;
 
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.User;
+import org.libreccm.security.UserRepository;
+import org.libreccm.ui.Message;
+import org.libreccm.ui.MessageType;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.transaction.Transactional;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -41,6 +52,18 @@ import javax.ws.rs.QueryParam;
 @Path("/users-groups-roles/users")
 public class UsersController {
 
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private UserDetailsModel userDetailsModel;
+
+    @Inject
+    private UserRepository userRepository;
+
     @Inject
     private UsersTableModel usersTableModel;
 
@@ -59,11 +82,45 @@ public class UsersController {
     @Path("/{userIdentifier}/details")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getUser(
-        @PathParam("userIdentifier") final String userIdentifier
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String getUserDetails(
+        @PathParam("userIdentifier") final String userIdentifierParam
     ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            userIdentifierParam
+        );
+        final Optional<User> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = userRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = userRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = userRepository.findByName(identifier.getIdentifier());
+                break;
+        }
 
-        throw new UnsupportedOperationException();
+        if (result.isPresent()) {
+            userDetailsModel.setUser(result.get());
+            return "org/libreccm/ui/admin/users-groups-roles/user-details.xhtml";
+        } else {
+            userDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.users.not_found.message",
+                        Arrays.asList(userIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+        }
     }
 
     @POST
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
index a61c9f4b2..5011f27a1 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
@@ -36,7 +36,6 @@ import javax.ws.rs.Path;
 @Path("/users-groups-roles")
 public class UsersGroupsRolesController {
 
-  
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -45,23 +44,4 @@ public class UsersGroupsRolesController {
         return "org/libreccm/ui/admin/users-groups-roles/overview.xhtml";
     }
 
-    @GET
-    @Path("/groups")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getGroups() {
-        return "org/libreccm/ui/admin/users-groups-roles/groups.xhtml";
-    }
-
-    @GET
-    @Path("/roles")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getRoles() {
-        return "org/libreccm/ui/admin/users-groups-roles/roles.xhtml";
-    }
-
-    
-
-    
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
index 4212574cb..bf32b3afd 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
@@ -32,17 +32,23 @@ import javax.enterprise.context.ApplicationScoped;
  */
 @ApplicationScoped
 public class UsersGroupsRolesPage implements AdminPage {
-     @Override
+
+    @Override
     public Set<Class<?>> getControllerClasses() {
         final Set<Class<?>> classes = new HashSet<>();
         classes.add(UsersGroupsRolesController.class);
+        classes.add(GroupsController.class);
+        classes.add(RolesController.class);
         classes.add(UsersController.class);
         return classes;
     }
 
     @Override
-    public String getPath() {
-        return "users-groups-roles";
+    public String getUriIdentifier() {
+        return String.format(
+            "%s#getOverview",
+            UsersGroupsRolesController.class.getSimpleName()
+        );
     }
 
     @Override
@@ -57,7 +63,7 @@ public class UsersGroupsRolesPage implements AdminPage {
 
     @Override
     public String getDescriptionBundle() {
-       return AdminConstants.ADMIN_BUNDLE;
+        return AdminConstants.ADMIN_BUNDLE;
     }
 
     @Override
@@ -74,4 +80,5 @@ public class UsersGroupsRolesPage implements AdminPage {
     public int getPosition() {
         return 10;
     }
+
 }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
index cd0d52d15..705e1dc97 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml
@@ -29,8 +29,8 @@
                     <ul class="navbar-nav mr-auto">
                         <c:forEach items="#{AdminPagesModel.adminPages}" var="page">
                             <li class="nav-item">
-                                <a class="nav-link #{activePage == page.path?'active':''}" 
-                                   href="#{request.contextPath}/@admin/#{page.path}">
+                                <a class="nav-link #{activePage == page.uriIdentifier?'active':''}" 
+                                   href="#{mvc.uri(page.uriIdentifier)}">
                                     <svg class="bi"
                                          width="1em"
                                          height="1em"
@@ -47,7 +47,7 @@
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb">
                     <li class="breadcrumb-item">
-                        <a href="#{request.contextPath}/@admin/">
+                        <a href="#{mvc.uri('DashboardController#getDashboard')}">
                             #{AdminMessages['breadcrumbs.start']}
                         </a>
                     </li>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
index 2ddb572ad..b9c5d8f28 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml
@@ -20,19 +20,19 @@
                 <div class="row">
                     <nav class="col-md-2 list-group">
                         <a class="list-group-item list-group-item-action #{activePanel == 'overview' ? 'active' : ''}" 
-                           href="#{request.contextPath}/@admin/users-groups-roles">
+                           href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
                             #{AdminMessages['usersgroupsroles.overview.label']}
                         </a>
                         <a class="list-group-item list-group-item-action #{activePanel == 'users' ? 'active' : ''}" 
-                           href="#{request.contextPath}/@admin/users-groups-roles/users">
+                           href="#{mvc.uri('UsersController#getUsers')}">
                             #{AdminMessages['usersgroupsroles.users.label']}
                         </a>
                         <a class="list-group-item list-group-item-action #{activePanel == 'groups' ? 'active' : ''}" 
-                           href="#{request.contextPath}/@admin/users-groups-roles/groups">
+                           href="#{mvc.uri('GroupsController#getGroups')}">
                             #{AdminMessages['usersgroupsroles.groups.label']}
                         </a>
                         <a class="list-group-item list-group-item-action #{activePanel == 'roles' ? 'active' : ''}" 
-                           href="#{request.contextPath}/@admin/users-groups-roles/roles">
+                           href="#{mvc.uri('RolesController#getRoles')}">
                             #{AdminMessages['usersgroupsroles.roles.label']}
                         </a>
                     </nav>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
index 8029a7ff7..10a4150f6 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
@@ -11,7 +11,9 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{request.contextPath}/@admin/users-groups-roles/">#{AdminMessages['usersgroupsroles.label']}</a>
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
             </li>
             <li class="breadcrumb-item active">
                 #{AdminMessages['usersgroupsroles.groups.label']}
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
index 26bdf61c6..139633fc6 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
@@ -11,7 +11,9 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{request.contextPath}/@admin/users-groups-roles/">#{AdminMessages['usersgroupsroles.label']}</a>
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
             </li>
             <li class="breadcrumb-item active">
                 #{AdminMessages['usersgroupsroles.roles.label']}
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
new file mode 100644
index 000000000..4f8c952f5
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -0,0 +1,298 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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">
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="users" />
+        <ui:param name="title"
+                  value="#{AdminMessages.getMessage('usersgroupsroles.users.user_details.title', [UserDetailsModel.name])}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersController#getUsers')}">
+                    #{AdminMessages['usersgroupsroles.users.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                #{UserDetailsModel.name}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <dl>
+                <div>
+                    <dt>#{AdminMessages['usergroupsroles.users.user_details.id']}</dt>
+                    <dd>#{UserDetailsModel.userId}</dd>
+                </div>
+                <div>
+                    <dt>#{AdminMessages['usergroupsroles.users.user_details.uuid']}</dt>
+                    <dd>#{UserDetailsModel.uuid}</dd>
+                </div>
+                <div>
+                    <dt>#{AdminMessages['usergroupsroles.users.user_details.name']}</dt>
+                    <dd>#{UserDetailsModel.name}</dd>
+                </div>
+                <div>
+                    <dt>#{AdminMessages['usergroupsroles.users.user_details.given_name']}</dt>
+                    <dd>#{UserDetailsModel.givenName}</dd>
+                </div>
+                <div>
+                    <dt>#{AdminMessages['usergroupsroles.users.user_details.family name']}</dt>
+                    <dd>#{UserDetailsModel.familyName}</dd>
+                </div>
+                <div>
+                    <dt>
+                        #{AdminMessages['usergroupsroles.users.user_details.primary_email_address']}
+                    </dt>
+                    <dd>
+                        <dl>
+                            <dt>#{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.address']}</dt>
+                            <dd>
+                                #{UserDetailsModel.primaryEmailAddress.address}
+                            </dd>
+                            <dt>
+                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.boucing']}
+                            </dt>
+                            <dd>
+                                <c:choose>
+                                    <c:when test="#{UserDetailsModel.primaryEmailAddress.bouncing}">
+                                        #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.yes']}
+                                    </c:when>
+                                    <c:otherwise>
+                                        #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.no']}
+                                    </c:otherwise>
+                                </c:choose>
+                            </dd>
+                            <dt>
+                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.verified']}
+                            </dt>
+                            <dd>
+                                <c:choose>
+                                    <c:when test="#{UserDetailsModel.primaryEmailAddress.verified}">
+                                        #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.yes']}
+                                    </c:when>
+                                    <c:otherwise>
+                                        #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.no']}
+                                    </c:otherwise>
+                                </c:choose>
+                            </dd>
+                        </dl>
+                    </dd>
+                </div>
+                <div>
+                    <dt>
+                        #{AdminMessages['usergroupsroles.users.user_details.disabled']}
+                    </dt>
+                    <dd>
+                        <c:choose >
+                            <c:when test="#{UserDetailsModel.banned}">
+                                #{AdminMessages['usergroupsroles.users.user_details.disabled.yes']}
+                            </c:when>
+                            <c:otherwise>
+                                #{AdminMessages['usergroupsroles.users.user_details.disabled.no']}
+                            </c:otherwise>
+                        </c:choose>
+                    </dd>
+                </div>
+                <div>
+                    <dt>
+                        #{AdminMessages['usergroupsroles.users.user_details.password_reset_required']}
+                    </dt>
+                    <dd>
+                        <c:choose >
+                            <c:when test="#{UserDetailsModel.passwordResetRequired}">
+                                #{AdminMessages['usergroupsroles.users.user_details.password_reset_required.yes']}
+                            </c:when>
+                            <c:otherwise>
+                                #{AdminMessages['usergroupsroles.users.user_details.password_reset_required.no']}
+                            </c:otherwise>
+                        </c:choose>
+                    </dd>
+                </div>
+            </dl>
+            <a class="btn btn-info" href="#">
+                <svg class="bi"
+                     width="1em"
+                     height="1em"
+                     fill="currentColor">
+                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                </svg>
+                <span>
+                    #{AdminMessages['usergroupsroles.users.user_details.edit_user']}
+                </span>
+            </a>
+
+
+            <c:if test="#{UserDetailsModel.emailAddresses.size() > 0}">
+                <h2>
+                    #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.heading']}
+                </h2>
+                <a class="btn btn-secondary" href="#">
+                    <svg class="bi"
+                         width="1em"
+                         height="1em"
+                         fill="currentColor">
+                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
+                    </svg>
+                    <span>#{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.add']}</span>
+                </a>
+                <table class="table table-hover">
+                    <thead class="thead-light">
+                        <tr>
+                            <th>
+                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.address']}
+                            </th>
+                            <th class="text-center">
+                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.boucing']}
+                            </th>
+                            <th class="text-center">
+                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.verified']}
+                            </th>
+                            <th class="text-center" colspan="2">
+                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.actions']}
+                            </th>
+                        </tr>
+                        <c:forEach items="#{UserDetailsModel.emailAddresses}"
+                                   var="address">
+                            <tr>
+                                <td>
+                                    #{address.address}
+                                </td>
+                                <td>
+                                    <c:choose>
+                                        <c:when test="#{address.bouncing}">
+                                            #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.yes']}
+                                        </c:when>
+                                        <c:otherwise>
+                                            #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.no']}
+                                        </c:otherwise>
+                                    </c:choose>
+                                </td>
+                                <td>
+                                    <c:choose>
+                                        <c:when test="#{address.verified}">
+                                            #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.yes']}
+                                        </c:when>
+                                        <c:otherwise>
+                                            #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.no']}
+                                        </c:otherwise>
+                                    </c:choose>
+                                </td>
+                                <td>
+                                    <a class="btn btn-info" href="#">
+                                        <svg class="bi"
+                                             width="1em"
+                                             height="1em"
+                                             fill="currentColor">
+                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                                        </svg>
+                                        <span>
+                                            #{AdminMessages['usergroupsroles.users.user_details.email_addresses.edit']}
+                                        </span>
+                                    </a>
+                                </td>
+                                <td>
+                                    <a class="btn btn-danger" href="#">
+                                        <svg class="bi"
+                                             width="1em"
+                                             height="1em"
+                                             fill="currentColor">
+                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                        </svg>
+                                        <span>
+                                            #{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove']}
+                                        </span>
+                                    </a>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                    </thead>
+                </table>
+            </c:if>
+
+            <c:if test="#{UserDetailsModel.groupMemberships.size() > 0}">
+                <h2>
+                    #{AdminMessages['usergroupsroles.users.user_details.groups.heading']}
+                </h2>
+                <a class="btn btn-secondary" href="#">
+                    <svg class="bi"
+                         width="1em"
+                         height="1em"
+                         fill="currentColor">
+                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
+                    </svg>
+                    <span>#{AdminMessages['usergroupsroles.users.user_details.groups.add']}</span>
+                </a>
+                <ul class="list-group mt-1">
+                    <c:forEach items="#{UserDetailsModel.groupMemberships}"
+                               var="group">
+                        <li class="list-group-item d-flex justify-content-between align-items-center">
+                            <a href="#">
+                                #{group.groupName}
+                            </a>
+                            <a class="btn btn-danger" href="#">
+                                <svg class="bi"
+                                     width="1em"
+                                     height="1em"
+                                     fill="currentColor">
+                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                </svg>
+                                <span>
+                                    #{AdminMessages['usergroupsroles.users.user_details.groups.remove']}
+                                </span>
+                            </a>
+                        </li>
+                    </c:forEach>
+                </ul>
+            </c:if>
+
+            <c:if test="#{UserDetailsModel.roles.size() > 0}">
+                <h2>
+                    #{AdminMessages['usergroupsroles.users.user_details.roles.heading']}
+                </h2>
+                <a class="btn btn-secondary" href="#">
+                    <svg class="bi"
+                         width="1em"
+                         height="1em"
+                         fill="currentColor">
+                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
+                    </svg>
+                    <span>#{AdminMessages['usergroupsroles.users.user_details.roles.add']}</span>
+                </a>
+                <ul class="list-group mt-1">
+                    <c:forEach items="#{UserDetailsModel.roles}"
+                               var="role">
+                        <li class="list-group-item d-flex justify-content-between align-items-center">
+                            <a href="#">
+                                #{role.roleName}
+                            </a>
+                            <a class="btn btn-danger" href="#">
+                                <svg class="bi"
+                                     width="1em"
+                                     height="1em"
+                                     fill="currentColor">
+                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                </svg>
+                                <span>
+                                    #{AdminMessages['usergroupsroles.users.user_details.roles.remove']}
+                                </span>
+                            </a>
+                        </li>
+                    </c:forEach>
+                </ul>
+            </c:if>
+        </ui:define>
+
+    </ui:composition>
+
+
+</html>
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml
new file mode 100644
index 000000000..3a059faed
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="users" />
+        <ui:param name="title"
+                  value="#{AdminMessages('usersgroupsroles.users.not_found.title')}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersController#getUsers')}">
+                    #{AdminMessages['usersgroupsroles.users.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                #{AdminMessages['usersgroupsroles.users.not_found.title']}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <c:forEach items="#{UserDetailsModel.messages}" var="message">
+                <div class="alert alert-#{message.type}" role="alert">
+                    #{message}
+                </div>
+            </c:forEach>
+        </ui:define>
+
+    </ui:composition>
+
+
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
index 58222e0e4..fc26a29cc 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
@@ -12,7 +12,9 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                <a href="#{request.contextPath}/@admin/users-groups-roles/">#{AdminMessages['usersgroupsroles.label']}</a>
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
             </li>
             <li class="breadcrumb-item active">
                 #{AdminMessages['usersgroupsroles.users.label']}
@@ -22,7 +24,7 @@
         <ui:define name="panel">
             <div class="row mb-2">
                 <div class="col-sm-9">
-                    <form action="#{request.contextPath}/@admin/users-groups-roles/users" 
+                    <form action="#{mvc.uri('UsersController#getUsers')}" 
                           class="form-inline" 
                           method="get">
                         <div class="form-group">
@@ -76,14 +78,16 @@
                                 #{user.banned ? AdminMessages['usersgroupsroles.users.table.headers.disabled.true'] : AdminMessages['usersgroupsroles.users.table.headers.disabled.false']}
                             </td>
                             <td class="text-center action-col">
-                                <a class="btn btn-info" href="#">
+                                <a class="btn btn-info" 
+                                   href="#{mvc.uri('UsersController#getUserDetails', { 'userIdentifier': user.name })}">
                                     <svg class="bi"
                                          width="1em"
                                          height="1em"
                                          fill="currentColor">
                                         <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#eye" />
                                     </svg>
-                                    <span>#{AdminMessages['usersgroupsroles.users.detailslink.label']}
+                                    <span>
+                                        #{AdminMessages['usersgroupsroles.users.detailslink.label']}
                                     </span>
                                 </a>
                             </td>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index d7384ddd0..a9a37b990 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -38,3 +38,35 @@ usersgroupsroles.users.disablebutton.label=Disable
 usersgroupsroles.users.add=Add user
 usersgroupsroles.users.filter.label=Filter users
 usersgroupsroles.users.filter.submit=Submit
+usersgroupsroles.users.not_found.title=User not found
+usersgroupsroles.users.user_details.title=User {0} Details
+usergroupsroles.users.user_details.id=User ID
+usergroupsroles.users.user_details.uuid=UUID
+usergroupsroles.users.user_details.name=Name
+usergroupsroles.users.user_details.given_name=Given name
+usergroupsroles.users.user_details.familyname=Familyname
+usergroupsroles.users.user_details.primary_email_address=Primary email address
+usergroupsroles.users.user_details.disabled=Disabled?
+usergroupsroles.users.user_details.disabled.yes=Yes
+usergroupsroles.users.user_details.disabled.no=No
+usergroupsroles.users.user_details.password_reset_required=Password reset required?
+usergroupsroles.users.user_details.password_reset_required.yes=Yes
+usergroupsroles.users.user_details.password_reset_required.no=No
+usergroupsroles.users.user_details.additional_email_addresses.heading=Additional email addresses
+'usergroupsroles.users.user_details.additional_email_addresses.cols.address=Address
+usergroupsroles.users.user_details.additional_email_addresses.cols.boucing=Bouncing?
+usergroupsroles.users.user_details.additional_email_addresses.cols.verified=Verified
+usergroupsroles.users.user_details.additional_email_addresses.cols.actions=Actions
+usergroupsroles.users.user_details.email_address.bouncing.yes=Yes
+usergroupsroles.users.user_details.email_address.bouncing.no=No
+usergroupsroles.users.user_details.email_address.verified.yes=Yes
+usergroupsroles.users.user_details.email_address.verified.no=No
+usergroupsroles.users.user_details.email_addresses.remove=Remove
+usergroupsroles.users.user_details.email_addresses.edit=Edit
+usergroupsroles.users.user_details.groups.heading=Groups Memberships
+usergroupsroles.users.user_details.groups.add=Add
+usergroupsroles.users.user_details.groups.remove=Remove
+usergroupsroles.users.user_details.roles.heading=Roles
+usergroupsroles.users.user_details.roles.add=Add
+usergroupsroles.users.user_details.roles.remove=Remove
+usergroupsroles.users.user_details.edit_user=Edit
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index f8baca984..56dd82bf4 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -38,3 +38,35 @@ usersgroupsroles.users.disablebutton.label=Sperren
 usersgroupsroles.users.add=Benutzer*in hinzuf\u00fcgen
 usersgroupsroles.users.filter.label=Benutzer*innen filtern
 usersgroupsroles.users.filter.submit=Anwenden
+usersgroupsroles.users.not_found.title=Benutzer*in nicht gefunden
+usersgroupsroles.users.user_details.title=Details Benutzer*in {0}
+usergroupsroles.users.user_details.id=Benutzer*in ID
+usergroupsroles.users.user_details.uuid=UUID
+usergroupsroles.users.user_details.name=Name
+usergroupsroles.users.user_details.given_name=Vorname
+usergroupsroles.users.user_details.familyname=Familienname
+usergroupsroles.users.user_details.primary_email_address=Prim\u00e4re E-Mail-Adresse
+usergroupsroles.users.user_details.disabled=Inaktiv?
+usergroupsroles.users.user_details.disabled.yes=Ja
+usergroupsroles.users.user_details.disabled.no=Nein
+usergroupsroles.users.user_details.password_reset_required=Neues Password erforderlich?
+usergroupsroles.users.user_details.password_reset_required.yes=Ja
+usergroupsroles.users.user_details.password_reset_required.no=Nein
+usergroupsroles.users.user_details.additional_email_addresses.heading=Weitere E-Mail-Addressen
+'usergroupsroles.users.user_details.additional_email_addresses.cols.address=Addresse
+usergroupsroles.users.user_details.additional_email_addresses.cols.boucing=Wird zur\u00fcckgewiesen?
+usergroupsroles.users.user_details.additional_email_addresses.cols.verified=Verifizizert
+usergroupsroles.users.user_details.additional_email_addresses.cols.actions=Aktionen
+usergroupsroles.users.user_details.email_address.bouncing.yes=Ja
+usergroupsroles.users.user_details.email_address.bouncing.no=Nein
+usergroupsroles.users.user_details.email_address.verified.yes=Ja
+usergroupsroles.users.user_details.email_address.verified.no=Nein
+usergroupsroles.users.user_details.email_addresses.remove=Entfernen
+usergroupsroles.users.user_details.email_addresses.edit=Bearbeiten
+usergroupsroles.users.user_details.groups.heading=Gruppenmitgliedschaften
+usergroupsroles.users.user_details.groups.add=Hinzuf\u00fcgen
+usergroupsroles.users.user_details.groups.remove=Entfernen
+usergroupsroles.users.user_details.roles.heading=Rollen
+usergroupsroles.users.user_details.roles.add=Hinzuf\u00fcgen
+usergroupsroles.users.user_details.roles.remove=Entfernen
+usergroupsroles.users.user_details.edit_user=Bearbeiten

From d2c296a84a00e15f3de5d6bc3ce75a17d38b2d7d Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Fri, 25 Sep 2020 20:03:33 +0200
Subject: [PATCH 11/93] Forms for managing users (not tested yet!)

---
 .../usersgroupsroles/EmailFormController.java | 281 ++++++++++++++++++
 .../usersgroupsroles/EmailFormModel.java      |  76 +++++
 .../usersgroupsroles/UserDetailsModel.java    |   5 +-
 .../usersgroupsroles/UserFormController.java  | 207 +++++++++++++
 .../usersgroupsroles/UsersController.java     | 209 ++++++++++---
 .../admin/users-groups-roles/email-form.xhtml |  90 ++++++
 .../users-groups-roles/email-not-found.xhtml  |  38 +++
 .../users-groups-roles/user-details.xhtml     |  48 ++-
 .../admin/users-groups-roles/user-form.xhtml  | 190 ++++++++++++
 .../ui/admin/users-groups-roles/users.xhtml   |  43 ++-
 .../org/libreccm/ui/AdminBundle.properties    |  45 +++
 .../org/libreccm/ui/AdminBundle_de.properties |  45 +++
 12 files changed, 1224 insertions(+), 53 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
new file mode 100644
index 000000000..6f1bc5e81
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.core.CoreConstants;
+import org.libreccm.core.EmailAddress;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.User;
+import org.libreccm.security.UserRepository;
+import org.libreccm.ui.Message;
+import org.libreccm.ui.MessageType;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.mvc.binding.MvcBinding;
+import javax.transaction.Transactional;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/users-groups-roles/users/{userIdentifier}/email-addresses")
+public class EmailFormController {
+
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private EmailFormModel emailFormModel;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private Models models;
+
+    @Inject
+    private UserDetailsModel userDetailsModel;
+
+    @Inject
+    private UserRepository userRepository;
+
+    @MvcBinding
+    @FormParam("address")
+    @NotBlank
+    @Email
+    private String address;
+
+    @FormParam("bouncing")
+    private boolean bouncing;
+
+    @FormParam("verified")
+    private boolean verified;
+
+    @GET
+    @Path("/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String getNewEmailAddressForm(
+        @PathParam("userIdentifier") final String userIdentifierParam
+    ) {
+        return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
+    }
+
+    @POST
+    @Path("/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String addNewEmailAddress(
+        @PathParam("userIdentifier") final String userIdentifierParam
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            userIdentifierParam
+        );
+        final Optional<User> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = userRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = userRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = userRepository.findByName(identifier.getIdentifier());
+                break;
+        }
+
+        if (result.isPresent()) {
+            final User user = result.get();
+
+            final EmailAddress emailAddress = new EmailAddress();
+            emailAddress.setAddress(address);
+            emailAddress.setBouncing(bouncing);
+            emailAddress.setVerified(verified);
+            user.addEmailAddress(emailAddress);
+
+            userRepository.save(user);
+
+            return String.format(
+                "redirect:/users-groups-roles/users/%s/details",
+                user.getName()
+            );
+        } else {
+            userDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.users.not_found.message",
+                        Arrays.asList(userIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+        }
+    }
+
+    @GET
+    @Path("/{emailId}")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String getEditEmailAddressForm(
+        @PathParam("userIdentifier") final String userIdentifierParam,
+        @PathParam("emailId") final int emailId
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            userIdentifierParam
+        );
+        final Optional<User> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = userRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = userRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = userRepository.findByName(identifier.getIdentifier());
+                break;
+        }
+
+        if (result.isPresent()) {
+            final User user = result.get();
+
+            if (user.getEmailAddresses().size() <= emailId) {
+                models.put("error.userIdentifier", userIdentifierParam);
+                models.put("error.emailId", emailId);
+                return "org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml";
+            } else {
+                final EmailAddress emailAddress = user
+                    .getEmailAddresses()
+                    .get(emailId);
+                emailFormModel.setAddress(emailAddress.getAddress());
+                emailFormModel.setBouncing(emailAddress.isBouncing());
+                emailFormModel.setVerified(emailAddress.isVerified());
+                return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
+            }
+        } else {
+            userDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.users.not_found.message",
+                        Arrays.asList(userIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+        }
+    }
+    
+    @POST
+    @Path("/{emailId}")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateEmailAddress(
+        @PathParam("userIdentifier") final String userIdentifierParam,
+        @PathParam("emailId") final int emailId
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            userIdentifierParam
+        );
+        final Optional<User> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = userRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = userRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = userRepository.findByName(identifier.getIdentifier());
+                break;
+        }
+
+        if (result.isPresent()) {
+            final User user = result.get();
+
+            if (user.getEmailAddresses().size() <= emailId) {
+                models.put("error.userIdentifier", userIdentifierParam);
+                models.put("error.emailId", emailId);
+                return "org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml";
+            } else {
+                final EmailAddress emailAddress = user
+                    .getEmailAddresses()
+                    .get(emailId);
+                
+                emailAddress.setAddress(address);
+                emailAddress.setBouncing(bouncing);
+                emailAddress.setVerified(verified);
+                
+                userRepository.save(user);
+                
+                return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
+            }
+        } else {
+            userDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.users.not_found.message",
+                        Arrays.asList(userIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+        }
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
new file mode 100644
index 000000000..d85904d25
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.core.EmailAddress;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+
+@RequestScoped
+@Named("EmailFormModel")
+public class EmailFormModel {
+    
+    private String address;
+    
+    private boolean bouncing;
+    
+    private boolean verified;
+    
+    public void setEmailAddress(final EmailAddress emailAddress) {
+        address = emailAddress.getAddress();
+        bouncing = emailAddress.isBouncing();
+        verified = emailAddress.isVerified();
+    }
+
+    public boolean isNew() {
+        return address == null;
+    }
+    
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public boolean isBouncing() {
+        return bouncing;
+    }
+
+    public void setBouncing(boolean bouncing) {
+        this.bouncing = bouncing;
+    }
+
+    public boolean isVerified() {
+        return verified;
+    }
+
+    public void setVerified(boolean verified) {
+        this.verified = verified;
+    }
+    
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
index 68b4a8a5a..744eea92b 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
@@ -58,7 +58,7 @@ public class UserDetailsModel {
 
     private boolean banned;
 
-    private boolean passwordResetRequired;
+    private boolean passwordResetRequired = true;
 
     private List<UserGroupMembership> groupMemberships;
 
@@ -153,4 +153,7 @@ public class UserDetailsModel {
         return Collections.unmodifiableList(roles);
     }
 
+    public boolean isNewUser() {
+        return userId == 0;
+    }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
new file mode 100644
index 000000000..1cda75d47
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.User;
+import org.libreccm.security.UserManager;
+import org.libreccm.security.UserRepository;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.mvc.binding.BindingResult;
+import javax.mvc.binding.MvcBinding;
+import javax.transaction.Transactional;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@Controller
+@Path("/users-groups-roles/users/")
+@RequestScoped
+public class UserFormController {
+
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private BindingResult bindingResult;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private Models models;
+
+    @Inject
+    private UserManager userManager;
+
+    @Inject
+    private UserRepository userRepository;
+
+    @MvcBinding
+    @FormParam("userName")
+    @NotBlank
+    private String userName;
+
+    @FormParam("givenName")
+    private String givenName;
+
+    @FormParam("familyName")
+    private String familyName;
+
+    @MvcBinding
+    @FormParam("primaryEmailAddress")
+    @NotBlank
+    @Email
+    private String primaryEmailAddress;
+
+    @FormParam("primaryEmailAddressBouncing")
+    private boolean primaryEmailAddressBouncing;
+
+    @FormParam("primaryEmailAddressVerified")
+    private boolean primaryEmailAddressVerified;
+
+    @FormParam("banned")
+    private boolean banned;
+
+    @FormParam("passwordResetRequired")
+    private boolean passwordResetRequired;
+
+    @FormParam("password")
+    private String password;
+
+    @FormParam("passwordConfirmation")
+    private String passwordConfirmation;
+
+    @POST
+    @Path("/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String createUser() {
+        if (bindingResult.isFailed()) {
+            models.put("errors", bindingResult.getAllMessages());
+            return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+        }
+
+        if (password == null || password.isEmpty()) {
+            models.put("errors", Arrays.asList(
+                       adminMessages.get(
+                           "usersgroupsroles.users.new.errors.password.empty")
+                   ));
+            return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+        }
+
+        if (!Objects.equals(password, passwordConfirmation)) {
+            models.put("errors", Arrays.asList(
+                       adminMessages.get(
+                           "usersgroupsroles.users.new.errors.password.no_match")
+                   ));
+            return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+        }
+
+        userManager.createUser(
+            givenName, familyName, userName, primaryEmailAddress, password
+        );
+
+        return "redirect:users-groups-roles/users";
+    }
+
+    @POST
+    @Path("{userIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateUser(
+        @PathParam("userIdentifier") final String userIdentifierParam
+    ) {
+        if (bindingResult.isFailed()) {
+            models.put("errors", bindingResult.getAllMessages());
+            return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+        }
+
+        final Identifier identifier = identifierParser.parseIdentifier(
+            userIdentifierParam
+        );
+        final Optional<User> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = userRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = userRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = userRepository.findByName(identifier.getIdentifier());
+                break;
+        }
+
+        if (result.isPresent()) {
+            final User user = result.get();
+            user.setUuid(userName);
+            user.setGivenName(givenName);
+            user.setFamilyName(familyName);
+            user.getPrimaryEmailAddress().setAddress(primaryEmailAddress);
+            user
+                .getPrimaryEmailAddress()
+                .setBouncing(primaryEmailAddressBouncing);
+            user
+                .getPrimaryEmailAddress()
+                .setBouncing(primaryEmailAddressVerified);
+            user.setBanned(banned);
+            user.setPasswordResetRequired(passwordResetRequired);
+
+            userRepository.save(user);
+            return "redirect:users-groups-roles/users";
+        } else {
+            models.put("errors", Arrays.asList(
+                       adminMessages.getMessage(
+                           "usersgroupsroles.users.not_found.message",
+                           Arrays.asList(userIdentifierParam)
+                       )
+                   ));
+            return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+        }
+
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
index 3b079f3e4..f13121cd9 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
@@ -35,8 +35,10 @@ import java.util.Optional;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.mvc.MvcContext;
 import javax.transaction.Transactional;
 import javax.ws.rs.DefaultValue;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -58,6 +60,9 @@ public class UsersController {
     @Inject
     private IdentifierParser identifierParser;
 
+    @Inject
+    private MvcContext mvc;
+
     @Inject
     private UserDetailsModel userDetailsModel;
 
@@ -123,81 +128,189 @@ public class UsersController {
         }
     }
 
-    @POST
-    @Path("/{userIdentifier}/create")
+    @GET
+    @Path("/new")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String createUser(
+    public String newUser(
         @PathParam("userIdentifier") final String userIdentifier
     ) {
-
-        throw new UnsupportedOperationException();
+        return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
     }
 
     @GET
-    @Path("/users/{userIdentifier}/edit")
+    @Path("/{userIdentifier}/edit")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String editUser(
-        @PathParam("userIdentifier") final String userIdentifier
+        @PathParam("userIdentifier") final String userIdentifierParam
     ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            userIdentifierParam
+        );
+        final Optional<User> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = userRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = userRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = userRepository.findByName(identifier.getIdentifier());
+                break;
+        }
 
-        throw new UnsupportedOperationException();
+        if (result.isPresent()) {
+            userDetailsModel.setUser(result.get());
+            return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+        } else {
+            userDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.users.not_found.message",
+                        Arrays.asList(userIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+        }
     }
 
     @POST
-    @Path("/users/{userIdentifier}/edit")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String updateUser(
-        @PathParam("userIdentifier") final String userIdentifier
-    ) {
-
-        throw new UnsupportedOperationException();
-    }
-
-    @POST
-    @Path("/users/{userIdentifier}/disable")
+    @Path("/{userIdentifier}/disable")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String disableUser(
-        @PathParam("userIdentifier") final String userIdentifier
+        @PathParam("userIdentifier") final String userIdentifierParam,
+        @FormParam("confirmed") final boolean confirmed
     ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            userIdentifierParam
+        );
+        final Optional<User> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = userRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = userRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = userRepository.findByName(identifier.getIdentifier());
+                break;
+        }
 
-        throw new UnsupportedOperationException();
-    }
-
-    @GET
-    @Path("/{userIdentifier}/emailaddresses")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getEmailAddressesOfUser(
-        @PathParam("userIdentifier") final String userIdentifier
-    ) {
-
-        throw new UnsupportedOperationException();
+        if (result.isPresent()) {
+            final User user = result.get();
+            user.setBanned(true);
+            userRepository.save(user);
+            return String.format(
+                "redirect:%s", mvc.uri("UsersController#getUsers")
+            );
+        } else {
+            userDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.users.not_found.message",
+                        Arrays.asList(userIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+        }
     }
 
     @POST
-    @Path("/{userIdentifier}/emailaddresses/{address}/add")
+    @Path("/{userIdentifier}/email-addresses/{emailId}/remove")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String addEmailAddresses(
-        @PathParam("userIdentifier") final String userIdentifier,
-        @PathParam("address") final String addressToAdd
+    public String removeEmailAddress(
+        @PathParam("userIdentifier") final String userIdentifierParam,
+        @PathParam("emailId") final int emailId,
+        @FormParam("confirmed") final boolean confirmed
     ) {
-        throw new UnsupportedOperationException();
-    }
+        if (!confirmed) {
+            return String.format(
+                "redirect:%s",
+                mvc.uri(
+                    String.format(
+                        "UsersController#getUserDetails",
+                        "{ userIdentifier: %s}",
+                        userIdentifierParam
+                    )
+                )
+            );
+        }
 
-    @POST
-    @Path("/{userIdentifier}/emailaddresses/{address}/remove")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String removeEmailAddresses(
-        @PathParam("userIdentifier") final String userIdentifier,
-        @PathParam("address") final String addressToRemove
-    ) {
-        throw new UnsupportedOperationException();
+        final Identifier identifier = identifierParser.parseIdentifier(
+            userIdentifierParam
+        );
+        final Optional<User> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = userRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = userRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = userRepository.findByName(identifier.getIdentifier());
+                break;
+        }
+
+        if (result.isPresent()) {
+            final User user = result.get();
+            if (user.getEmailAddresses().size() <= emailId) {
+                return String.format(
+                    "redirect:%s",
+                    mvc.uri(
+                        String.format(
+                            "UsersController#getUserDetails",
+                            "{ userIdentifier: %s}",
+                            userIdentifierParam
+                        )
+                    )
+                );
+            }
+            user.getEmailAddresses().remove(emailId);
+            userRepository.save(user);
+            return String.format(
+                "redirect:%s",
+                mvc.uri(
+                    String.format(
+                        "UsersController#getUserDetails",
+                        "{ userIdentifier: %s}",
+                        userIdentifierParam
+                    )
+                )
+            );
+        } else {
+            userDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.users.not_found.message",
+                        Arrays.asList(userIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+        }
     }
 
 }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
new file mode 100644
index 000000000..c57e40915
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="users" />
+        <ui:param name="title"
+                  value="#{EmailFormModel.new ? AdminMessages.getMessage('usersgroupsroles.users.email.edit.title', [UserDetailsModel.name]) : AdminMessages['usersgroupsroles.users.email.add.title']}" />
+        
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersController#getUsers')}">
+                    #{AdminMessages['usersgroupsroles.users.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvn.uri('UsersController#getUserDetails', { 'userIdentfier': user.name })}">
+                    #{UserDetailsModel.name}
+                </a>
+            </li>
+            <li class=breadcrumb-item active"> 
+                #{EmailFormModel.new ? AdminMessages['usersgroupsroles.users.breadcrumbs.email.add'] : AdminMessages['usersgroupsroles.users.breadcrumbs.email.edit']}
+            </li>
+        </ui:define>
+        
+        <ui:define name="panel">
+            <c:forEach items="#{errors}" var="error">
+                <div class="alert alert-danger" role="alert">
+                    #{error}
+                </div>
+            </c:forEach>
+            <form action="#{EmailFormModel.new ? mvc.uri('EmailFormController#addNewEmailAddress') : mvc.uri('EmailFormController#updateEmailAddress')}"
+                  method="post">
+                <div class="form-group">
+                    <label for="address">
+                        #{AdminMessages['usersgroupsroles.users.email.form.address.label']}
+                    </label>
+                    <input aria-described-by="address-help"
+                           class="form-control"
+                           id="address"
+                           name="address"
+                           value="#{EmailFormModel.address}"
+                           type="email" />
+                    <small class="form-text text-muted"
+                           id="address-help">
+                        #{AdminMessages['usersgroupsroles.users.email.form.address.help']}
+                    </small>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input"
+                           id="bouncing"
+                           name="bouncing"
+                           type="checkbox"
+                           value="#{EmailFormModel.bouncing}" />
+                    <label for="bouncing">
+                        #{AdminMessages['usersgroupsroles.users.email.form.bouncing.label']}
+                    </label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input"
+                           id="verified"
+                           name="verified"
+                           type="checkbox"
+                           value="#{EmailFormModel.verified}" />
+                    <label for="verified">
+                        #{AdminMessages['usersgroupsroles.users.email.form.verified.label']}
+                    </label>
+                </div>
+                <button class="btn btn-success" type="submit">
+                    <c:choose>
+                        <c:when test="#{EmailFormModel.new}">
+                            #{AdminMessages['usersgroupsroles.users.email.form.buttons.add']}
+                        </c:when>
+                        <c:otherwise>
+                            #{AdminMessages['usersgroupsroles.users.email.form.buttons.save']}
+                        </c:otherwise>
+                    </c:choose>
+                </button>
+            </form>
+        </ui:define>
+        
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml
new file mode 100644
index 000000000..eb93843ca
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="users" />
+        <ui:param name="title"
+                  value="#{AdminMessages('usersgroupsroles.users.email.not_found.title')}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersController#getUsers')}">
+                    #{AdminMessages['usersgroupsroles.users.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                #{AdminMessages['usersgroupsroles.users.email.not_found.title']}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            
+                <div class="alert alert-danger" role="alert">
+                    #{AdminMessages.getMessage('usersgroupsroles.users.email.not_found.message', [models['errors.userIdentifier'], models['errors.emailId']])}
+                </div>
+        </ui:define>
+
+    </ui:composition>
+
+
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
index 4f8c952f5..a130e9b64 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -161,7 +161,8 @@
                             </th>
                         </tr>
                         <c:forEach items="#{UserDetailsModel.emailAddresses}"
-                                   var="address">
+                                   var="address"
+                                   varStatus="status">
                             <tr>
                                 <td>
                                     #{address.address}
@@ -200,7 +201,9 @@
                                     </a>
                                 </td>
                                 <td>
-                                    <a class="btn btn-danger" href="#">
+                                    <button class="btn btn-danger" 
+                                            data-toggle="modal"
+                                            data-target="#confirm-remove-#{status.index}">
                                         <svg class="bi"
                                              width="1em"
                                              height="1em"
@@ -210,7 +213,46 @@
                                         <span>
                                             #{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove']}
                                         </span>
-                                    </a>
+                                    </button>
+                                    <div class="modal" 
+                                         id="confirm-remove-#{status.index}" 
+                                         tabindex="-1">
+                                        <div class="modal-dialog">
+                                            <form action="#{mvc.uri('UsersController#removeEmailAddress', { 'userIdentifier': user.name, 'emailId': status.index })}" 
+                                                  class="modal-content"
+                                                  method="post">
+                                                <div class="modal-header">
+                                                    <h3 class="modal-title">
+                                                        #{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.title']}
+                                                    </h3>
+                                                    <button aria-label="#{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel']}"  
+                                                            class="close" 
+                                                            data-dismiss="modal" 
+                                                            type="button">
+                                                        <span aria-hidden="true">&times;</span>
+                                                    </button>
+                                                </div>
+                                                <div class="modal-body">
+                                                    #{AdminMessages.getMessage('usergroupsroles.users.user_details.email_addresses.remove.confirm.message', [address.address])}
+                                                    <input name="confirmed" 
+                                                           type="hidden" 
+                                                           value="true" />
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <button class="btn btn-secondary" 
+                                                            data-dismiss="modal" 
+                                                            type="button">
+                                                        #{'usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel'}
+                                                    </button>
+                                                    <button class="btn btn-danger" 
+                                                            data-dismiss="modal" 
+                                                            type="submit">
+                                                        #{'usergroupsroles.users.user_details.email_addresses.remove.confirm.yes'}
+                                                    </button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
                                 </td>
                             </tr>
                         </c:forEach>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
new file mode 100644
index 000000000..8045f6c47
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="users" />
+        <ui:param name="title"
+                  value="#{UserDetailsModel.newUser ? AdminMessages.getMessage('usersgroupsroles.users.edit.title', [UserDetailsModel.name]) : AdminMessages['usersgroupsroles.users.create.title']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersController#getUsers')}">
+                    #{AdminMessages['usersgroupsroles.users.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvn.uri('UsersController#getUserDetails', { 'userIdentfier': user.name })}">
+                    #{UserDetailsModel.name}
+                </a>
+            </li>
+            <li>
+                
+                #{UserDetailsModel.newUser ? AdminMessages['usersgroupsroles.users.breadcrumb.new'] : AdminMessages['usersgroupsroles.users.breadcrumb.edit']}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <c:forEach items="#{errors}" var="error">
+                <div class="alert alert-danger" role="alert">
+                    #{error}
+                </div>
+            </c:forEach>
+            <form action="#{UserDetailsModel.newUser ? mvc.uri("UserFormController#createUser") : mvc.uri('UserFormController#updateUser')}"
+                  method="post">
+                <div class="form-group">
+                    <label for="username">
+                        #{AdminMessages['usersgroupsroles.users.form.username.label']}
+                    </label>
+                    <input aria-described-by="username-help"
+                           class="form-control" 
+                           id="username" 
+                           name="userName" 
+                           value="#{UserDetailsModel.name}"
+                           type="text" />
+                    <small class="form-text text-muted"
+                           id="username-help">
+                        #{AdminMessages['usersgroupsroles.users.form.username.help']}
+                    </small>
+                </div>
+                <div class="form-group">
+                    <label for="givenname">
+                        #{AdminMessages['usersgroupsroles.users.form.givenname.label']}
+                    </label>
+                    <input aria-described-by="givenname-help"
+                           class="form-control" 
+                           id="givenname" 
+                           name="givenName" 
+                           value="#{UserDetailsModel.givenName}"
+                           type="text" />
+                    <small class="form-text text-muted"
+                           id="givenname-help">
+                        #{AdminMessages['usersgroupsroles.users.form.givenname.help']}
+                    </small>
+                </div>
+                <div class="form-group">
+                    <label for="familyname">
+                        #{AdminMessages['usersgroupsroles.users.form.familyname.label']}
+                    </label>
+                    <input aria-described-by="familyname-help"
+                           class="form-control" 
+                           id="familyname" 
+                           name="familyName" 
+                           value="#{UserDetailsModel.familyName}"
+                           type="text" />
+                    <small class="form-text text-muted"
+                           id="familyname-help">
+                        #{AdminMessages['usersgroupsroles.users.form.familyname.help']}
+                    </small>
+                </div>
+                <div class="form-group">
+                    <label for="primary-email-address">
+                        #{AdminMessages['usersgroupsroles.users.form.primaryemailaddress.label']}
+                    </label>
+                    <input aria-described-by="primary-email-address-help"
+                           class="form-control" 
+                           id="primary-email-address" 
+                           name="primaryEmailAddress" 
+                           value="#{UserDetailsModel.primaryEmailAddress.address}"
+                           type="email" />
+                    <small class="form-text text-muted"
+                           id="primary-email-address-help">
+                        #{AdminMessages['usersgroupsroles.users.form.primaryemailaddress.help']}
+                    </small>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input"
+                           id="primary-email-address-bouncing"
+                           name="primaryEmailAddressBouncing"
+                           type="checkbox"
+                           value="#{UserDetailsModel.primaryEmailAddress.bouncing}" />
+                    <label for="primary-email-address-bouncing">
+                        #{AdminMessages['usersgroupsroles.users.form.primaryemailaddress.boucing.label']}
+                    </label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input"
+                           id="primary-email-address-verified"
+                           name="primaryEmailAddressVerified"
+                           type="checkbox"
+                           value="#{UserDetailsModel.primaryEmailAddress.verified}" />
+                    <label for="primary-email-address-bouncing">
+                        #{AdminMessages['usersgroupsroles.users.form.primaryemailaddress.verified.label']}
+                    </label>
+                </div>
+                <c:if test="#{UserDetailsModel.newUser}">
+                    <div class="form-group">
+                        <label for="password">
+                            #{AdminMessages['usersgroupsroles.users.form.password']}
+                        </label>
+                        <input aria-described-by="password-help"
+                               class="form-control" 
+                               id="password" 
+                               name="password" 
+                               type="text" />
+                        <small class="form-text text-muted"
+                               id="password-help">
+                            #{AdminMessages['usersgroupsroles.users.form.password.help']}
+                        </small>
+                    </div>
+                    <div class="form-group">
+                        <label for="password-confirmation">
+                            #{AdminMessages['usersgroupsroles.users.form.passwordconfirmation']}
+                        </label>
+                        <input aria-described-by="password-confirmation-help"
+                               class="form-control" 
+                               id="password-confirmation" 
+                               name="passwordConfirmation" 
+                               type="text" />
+                        <small class="form-text text-muted"
+                               id="password-help">
+                            #{AdminMessages['usersgroupsroles.users.form.passwordconfirmation.help']}
+                        </small>
+                    </div>
+                </c:if>
+                <div class="form-check">
+                    <input class="form-check-input"
+                           id="banned"
+                           name="banned"
+                           type="checkbox"
+                           value="#{UserDetailsModel.banned}" />
+                    <label for="banned">
+                        #{AdminMessages['usersgroupsroles.users.form.banned.label']}
+                    </label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input"
+                           id="password-reset-required"
+                           name="passwordResetRequired"
+                           type="checkbox"
+                           value="#{UserDetailsModel.passwordResetRequired}" />
+                    <label for="password-reset-required">
+                        #{AdminMessages['usersgroupsroles.users.form.passwordresetrequired.label']}
+                    </label>
+                </div>
+                <a class="btn btn-warning" 
+                   href="#{mvc.uri('UsersController#getUsers')}">
+                    #{AdminMessages['usersgroupsroles.users.form.buttons.cancel']}
+                </a>
+                <button class="btn btn-success" type="submit">
+                    <c:choose>
+                        <c:when test="#{UserDetailsModel.newUser}">
+                            #{AdminMessages['usersgroupsroles.users.form.buttons.create']}
+                        </c:when>
+                        <c:otherwise>
+                            #{AdminMessages['usersgroupsroles.users.form.buttons.save']}
+                        </c:otherwise>
+                    </c:choose>
+                </button>
+            </form>
+        </ui:define>
+
+</html>
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
index fc26a29cc..8b124acd1 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
@@ -92,7 +92,9 @@
                                 </a>
                             </td>
                             <td class="text-center action-col">
-                                <button class="btn btn-danger">
+                                <button class="btn btn-danger"
+                                        data-toggle="modal"
+                                        data-target="#confirm-disable-#{user.name}">
                                     <svg class="bi"
                                          width="1em"
                                          height="1em"
@@ -103,6 +105,45 @@
                                         #{AdminMessages['usersgroupsroles.users.disablebutton.label']}
                                     </span>
                                 </button>
+                                <div class="modal" 
+                                     id="confirm-disable-#{user.name}" 
+                                     tabindex="-1">
+                                    <div class="modal-dialog">
+                                        <form action="#{mvc.uri('UsersController#disableUser', { 'userIdentifier': user.name })}" 
+                                              class="modal-content"
+                                              method="post">
+                                            <div class="modal-header">
+                                                <h3 class="modal-title">
+                                                    #{AdminMessages['usersgroupsroles.users.disable.confirm.title']}
+                                                </h3>
+                                                <button aria-label="#{AdminMessages['usersgroupsroles.users.disable.confirm.cancel']}"  
+                                                        class="close" 
+                                                        data-dismiss="modal" 
+                                                        type="button">
+                                                    <span aria-hidden="true">&times;</span>
+                                                </button>
+                                            </div>
+                                            <div class="modal-body">
+                                                #{AdminMessages.getMessage('usersgroupsroles.users.disable.confirm.message', [user.name])}
+                                                <input name="confirmed" 
+                                                       type="hidden" 
+                                                       value="true" />
+                                            </div>
+                                            <div class="modal-footer">
+                                                <button class="btn btn-secondary" 
+                                                        data-dismiss="modal" 
+                                                        type="button">
+                                                    #{'usersgroupsroles.users.disable.confirm.cancel'}
+                                                </button>
+                                                <button class="btn btn-danger" 
+                                                        data-dismiss="modal" 
+                                                        type="submit">
+                                                    #{'usersgroupsroles.users.disable.confirm.yes'}
+                                                </button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
                             </td>
                         </tr>
                     </c:forEach>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index a9a37b990..80ef75e86 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -70,3 +70,48 @@ usergroupsroles.users.user_details.roles.heading=Roles
 usergroupsroles.users.user_details.roles.add=Add
 usergroupsroles.users.user_details.roles.remove=Remove
 usergroupsroles.users.user_details.edit_user=Edit
+usersgroupsroles.users.new.errors.password.empty=Password of a new user can't be empty
+usersgroupsroles.users.new.errors.password.no_match=Password and confirmation do not match
+usersgroupsroles.users.edit.title=Edit user {0}
+usersgroupsroles.users.form.username.label=User name
+usersgroupsroles.users.form.username.help=Unique name of the user which can be used to login
+usersgroupsroles.users.form.givenname.label=Given Name
+usersgroupsroles.users.form.givenname.help=Given name of the user
+usersgroupsroles.users.form.familyname.label=Family Name
+usersgroupsroles.users.form.familyname.help=Family name of the user
+usersgroupsroles.users.form.primaryemailaddress.label=Primary Email address
+usersgroupsroles.users.form.primaryemailaddress.help=Primary email address of the user
+usersgroupsroles.users.form.primaryemailaddress.boucing.label=Primary email address bouncing?
+usersgroupsroles.users.form.primaryemailaddress.verified.label=Primary email address verified?
+usersgroupsroles.users.form.password=Password
+usersgroupsroles.users.form.password.help=Password of the new user
+usersgroupsroles.users.form.passwordconfirmation=Password Confirmation
+usersgroupsroles.users.form.passwordconfirmation.help=Confirm the password by repeating it
+usersgroupsroles.users.form.banned.label=Disabled?
+usersgroupsroles.users.form.passwordresetrequired.label=Password reset required
+usersgroupsroles.users.form.buttons.cancel=Cancel
+usersgroupsroles.users.form.buttons.create=Create new user
+usersgroupsroles.users.form.buttons.save=Save
+usersgroupsroles.users.create.title=Create new user
+usersgroupsroles.users.email.not_found.title=Email address not found
+usersgroupsroles.users.email.not_found.message=User {0} has no email address with ID {1}.
+usersgroupsroles.users.breadcrumb.new=New User
+usersgroupsroles.users.breadcrumb.edit=Edit user
+usersgroupsroles.users.breadcrumbs.email.add=Add Email Address
+usersgroupsroles.users.breadcrumbs.email.edit=Edit Email Address
+usersgroupsroles.users.email.edit.title=Edit Email Address
+usersgroupsroles.users.email.add.title=Add Email Address
+usersgroupsroles.users.email.form.address.label=Email Address
+usersgroupsroles.users.email.form.address.help=The Email Address
+usersgroupsroles.users.email.form.bouncing.label=Bouncing?
+usersgroupsroles.users.email.form.verified.label=Verified
+usersgroupsroles.users.email.form.buttons.add=Add
+usersgroupsroles.users.email.form.buttons.save=Save
+usersgroupsroles.users.disable.confirm.title=Confirm to disable user
+usersgroupsroles.users.disable.confirm.cancel=Cancel
+usersgroupsroles.users.disable.confirm.message=Are you sure to disable user {0}
+usersgroupsroles.users.disable.confirm.yes=Disable User
+usergroupsroles.users.user_details.email_addresses.remove.confirm.title=Confirm Removal Of Email Address
+usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel=Cancel
+usergroupsroles.users.user_details.email_addresses.remove.confirm.message=Are you sure to remove email address {0}?
+usergroupsroles.users.user_details.email_addresses.remove.confirm.yes=Remove Email Address
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 56dd82bf4..d7ca0fe66 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -70,3 +70,48 @@ usergroupsroles.users.user_details.roles.heading=Rollen
 usergroupsroles.users.user_details.roles.add=Hinzuf\u00fcgen
 usergroupsroles.users.user_details.roles.remove=Entfernen
 usergroupsroles.users.user_details.edit_user=Bearbeiten
+usersgroupsroles.users.new.errors.password.empty=Das Passwort eines neuen Benutzers darf nicht leer sein.
+usersgroupsroles.users.new.errors.password.no_match=Password und Best\u00e4tigung stimmen nicht \u00fcberein.
+usersgroupsroles.users.edit.title=Benutzer*in {0} bearbeiten
+usersgroupsroles.users.form.username.label=Login-Name
+usersgroupsroles.users.form.username.help=Eindeutiger Name f\u00fcr den/die Benutzer*in
+usersgroupsroles.users.form.givenname.label=Vorname
+usersgroupsroles.users.form.givenname.help=Vorname des/der Benutzer*in
+usersgroupsroles.users.form.familyname.label=Familienname
+usersgroupsroles.users.form.familyname.help=Familienname des/der Benutzer*in
+usersgroupsroles.users.form.primaryemailaddress.label=Prim\u00e4re E-Mail-Addresse
+usersgroupsroles.users.form.primaryemailaddress.help=Prim\u00e4re E-Mail Addresse des/der Benutzer*in
+usersgroupsroles.users.form.primaryemailaddress.boucing.label=Werden Mails an die prim\u00e4re E-Mail-Addresse zur\u00fcckgewiesen?
+usersgroupsroles.users.form.primaryemailaddress.verified.label=Ist die prim\u00e4re E-Mail-Addresse verifiziert?
+usersgroupsroles.users.form.password=Passwort
+usersgroupsroles.users.form.password.help=Passwort des neuen Benutzers
+usersgroupsroles.users.form.passwordconfirmation=Passwort-Best\u00e4tigung
+usersgroupsroles.users.form.passwordconfirmation.help=Wiederholen Sie das Passwort zur Best\u00e4tigung
+usersgroupsroles.users.form.banned.label=Inaktiv?
+usersgroupsroles.users.form.passwordresetrequired.label=Neues Passwort erforderlich?
+usersgroupsroles.users.form.buttons.cancel=Abbrechen
+usersgroupsroles.users.form.buttons.create=Benutzer*in neu anlegen
+usersgroupsroles.users.form.buttons.save=Speichern
+usersgroupsroles.users.create.title=Neue(n) Benutzer*in anlegen
+usersgroupsroles.users.email.not_found.title=E-Mail Addresse nicht gefunden
+usersgroupsroles.users.email.not_found.message=Benutzer*in {0} hat keine E-Mail-Addresse mit der ID {1}.
+usersgroupsroles.users.breadcrumb.new=Benutzer*in anlegen
+usersgroupsroles.users.breadcrumb.edit=Benutzer*in bearbeiten
+usersgroupsroles.users.breadcrumbs.email.add=E-Mail-Addresse hinzuf\u00fcgen
+usersgroupsroles.users.breadcrumbs.email.edit=E-Mail-Addresse bearbeiten
+usersgroupsroles.users.email.edit.title=E-Mail Addresse bearbeiten
+usersgroupsroles.users.email.add.title=E-Mail Addresse hinzuf\u00fcgen
+usersgroupsroles.users.email.form.address.label=E-Mail-Addresse
+usersgroupsroles.users.email.form.address.help=Die E-Mail-Addresse
+usersgroupsroles.users.email.form.bouncing.label=Wird zur\u00fcckgewiesen?
+usersgroupsroles.users.email.form.verified.label=Verifiziert
+usersgroupsroles.users.email.form.buttons.add=Hinzuf\u00fcgen
+usersgroupsroles.users.email.form.buttons.save=Speichern
+usersgroupsroles.users.disable.confirm.title=Deaktivierung Benutzer*in best\u00e4tigen
+usersgroupsroles.users.disable.confirm.cancel=Abbrechen
+usersgroupsroles.users.disable.confirm.message=Sind Sie sicher das Sie den/die Benutzer*in {0} deaktivieren wollen?
+usersgroupsroles.users.disable.confirm.yes=Benutzer*in deaktivieren
+usergroupsroles.users.user_details.email_addresses.remove.confirm.title=Entfernen E-Mail-Addresse best\u00e4tigen
+usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel=Abbrechen
+usergroupsroles.users.user_details.email_addresses.remove.confirm.message=Sind Sie sicher, dass Sie die E-Mail-Addresse {0} entfernen wollen?
+usergroupsroles.users.user_details.email_addresses.remove.confirm.yes=E-Mail-Addresse entfernen

From 9c28860d3c607fc0b990e5da57769c524230e9b9 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 28 Sep 2020 21:11:37 +0200
Subject: [PATCH 12/93] IMprovements for user management UI

---
 .../usersgroupsroles/UserDetailsModel.java    |  29 ++
 .../usersgroupsroles/UserFormController.java  |  27 +-
 .../usersgroupsroles/UserGroupsFormEntry.java |  68 +++
 .../users-groups-roles/user-details.xhtml     | 421 ++++++++++--------
 .../ui/admin/users-groups-roles/users.xhtml   |   2 +-
 .../org/libreccm/ui/AdminBundle.properties    |   9 +
 .../org/libreccm/ui/AdminBundle_de.properties |   9 +
 .../main/typescript/ccm-admin/ccm-admin.ts    |   6 +-
 .../typescript/ccm-admin/filterable-list.ts   | 135 ++++++
 9 files changed, 519 insertions(+), 187 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsFormEntry.java
 create mode 100644 ccm-core/src/main/typescript/ccm-admin/filterable-list.ts

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
index 744eea92b..2dcd27e1b 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
@@ -19,7 +19,9 @@
 package org.libreccm.ui.admin.usersgroupsroles;
 
 import org.libreccm.core.EmailAddress;
+import org.libreccm.security.Group;
 import org.libreccm.security.GroupMembership;
+import org.libreccm.security.GroupRepository;
 import org.libreccm.security.RoleMembership;
 import org.libreccm.security.User;
 import org.libreccm.ui.Message;
@@ -31,6 +33,7 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.inject.Named;
 import javax.transaction.Transactional;
 
@@ -41,6 +44,9 @@ import javax.transaction.Transactional;
 @RequestScoped
 @Named("UserDetailsModel")
 public class UserDetailsModel {
+    
+    @Inject
+    private GroupRepository groupRepository;
 
     private long userId;
 
@@ -148,6 +154,14 @@ public class UserDetailsModel {
     public List<UserGroupMembership> getGroupMemberships() {
         return Collections.unmodifiableList(groupMemberships);
     }
+    
+    public List<UserGroupsFormEntry> getUserGroupsFormEntries() {
+        return groupRepository
+            .findAll()
+            .stream()
+            .map(this::buildUserGroupsFormEntry)
+            .collect(Collectors.toList());
+    }
 
     public List<PartyRoleMembership> getRoles() {
         return Collections.unmodifiableList(roles);
@@ -156,4 +170,19 @@ public class UserDetailsModel {
     public boolean isNewUser() {
         return userId == 0;
     }
+    
+    private UserGroupsFormEntry buildUserGroupsFormEntry(final Group group) {
+        final UserGroupsFormEntry entry = new UserGroupsFormEntry();
+        entry.setGroupId(group.getPartyId());
+        entry.setGroupName(group.getName());
+        entry.setGroupUuid(group.getUuid());
+        entry.setMember(
+            groupMemberships
+            .stream()
+            .anyMatch(
+                membership -> membership.getGroupUuid().equals(group.getUuid())
+            )
+        );
+        return entry;
+    }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
index 1cda75d47..2c713a3ed 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
@@ -36,6 +36,7 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
+import javax.mvc.MvcContext;
 import javax.mvc.binding.BindingResult;
 import javax.mvc.binding.MvcBinding;
 import javax.transaction.Transactional;
@@ -66,6 +67,9 @@ public class UserFormController {
 
     @Inject
     private Models models;
+    
+    @Inject
+    private MvcContext mvc;
 
     @Inject
     private UserManager userManager;
@@ -201,7 +205,28 @@ public class UserFormController {
                    ));
             return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
         }
-
+    }
+    
+    @POST
+    @Path("{userIdentifier}/groups")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateGroupMemberships(
+        @PathParam("userIdentifier") final String userIdentifierParam,
+        @FormParam("userGroups") final String[] userGroups
+    ) {
+        // ToDo
+        return String.format(
+            "redirect:%s", 
+            mvc.uri(
+                String.format(
+                    "UsersController#getUserDetails", 
+                    "{userIdentifier: %s}", 
+                    userIdentifierParam
+                )
+            )
+        );
     }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsFormEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsFormEntry.java
new file mode 100644
index 000000000..06eb026f5
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsFormEntry.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class UserGroupsFormEntry {
+
+    private long groupId;
+
+    private String groupUuid;
+
+    private String groupName;
+
+    private boolean member;
+
+    public long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(final long groupId) {
+        this.groupId = groupId;
+    }
+
+    public String getGroupUuid() {
+        return groupUuid;
+    }
+
+    public void setGroupUuid(final String groupUuid) {
+        this.groupUuid = groupUuid;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(final String groupName) {
+        this.groupName = groupName;
+    }
+
+    public boolean isMember() {
+        return member;
+    }
+
+    public void setMember(final boolean member) {
+        this.member = member;
+    }
+
+    
+}
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
index a130e9b64..d42af0124 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -118,7 +118,7 @@
                     </dd>
                 </div>
             </dl>
-            <a class="btn btn-info" href="#">
+            <a class="btn btn-primary" href="#">
                 <svg class="bi"
                      width="1em"
                      height="1em"
@@ -130,211 +130,264 @@
                 </span>
             </a>
 
-
-            <c:if test="#{UserDetailsModel.emailAddresses.size() > 0}">
-                <h2>
+            <div class="d-flex">
+                <h2 class="mr-2">
                     #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.heading']}
                 </h2>
-                <a class="btn btn-secondary" href="#">
-                    <svg class="bi"
-                         width="1em"
-                         height="1em"
-                         fill="currentColor">
-                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
-                    </svg>
-                    <span>#{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.add']}</span>
-                </a>
-                <table class="table table-hover">
-                    <thead class="thead-light">
-                        <tr>
-                            <th>
-                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.address']}
-                            </th>
-                            <th class="text-center">
-                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.boucing']}
-                            </th>
-                            <th class="text-center">
-                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.verified']}
-                            </th>
-                            <th class="text-center" colspan="2">
-                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.actions']}
-                            </th>
-                        </tr>
-                        <c:forEach items="#{UserDetailsModel.emailAddresses}"
-                                   var="address"
-                                   varStatus="status">
+                <div>
+                    <a class="btn btn-primary" href="#">
+                        <svg class="bi"
+                             width="1em"
+                             height="1em"
+                             fill="currentColor">
+                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
+                        </svg>
+                        <span>#{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.add']}</span>
+                    </a>
+                </div>
+            </div>
+            <c:choose>
+                <c:when test="#{UserDetailsModel.emailAddresses.size() > 0}">
+                    <table class="table table-hover">
+                        <thead class="thead-light">
                             <tr>
-                                <td>
-                                    #{address.address}
-                                </td>
-                                <td>
-                                    <c:choose>
-                                        <c:when test="#{address.bouncing}">
-                                            #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.yes']}
-                                        </c:when>
-                                        <c:otherwise>
-                                            #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.no']}
-                                        </c:otherwise>
-                                    </c:choose>
-                                </td>
-                                <td>
-                                    <c:choose>
-                                        <c:when test="#{address.verified}">
-                                            #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.yes']}
-                                        </c:when>
-                                        <c:otherwise>
-                                            #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.no']}
-                                        </c:otherwise>
-                                    </c:choose>
-                                </td>
-                                <td>
-                                    <a class="btn btn-info" href="#">
-                                        <svg class="bi"
-                                             width="1em"
-                                             height="1em"
-                                             fill="currentColor">
-                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                                        </svg>
-                                        <span>
-                                            #{AdminMessages['usergroupsroles.users.user_details.email_addresses.edit']}
-                                        </span>
-                                    </a>
-                                </td>
-                                <td>
-                                    <button class="btn btn-danger" 
-                                            data-toggle="modal"
-                                            data-target="#confirm-remove-#{status.index}">
-                                        <svg class="bi"
-                                             width="1em"
-                                             height="1em"
-                                             fill="currentColor">
-                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                        </svg>
-                                        <span>
-                                            #{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove']}
-                                        </span>
-                                    </button>
-                                    <div class="modal" 
-                                         id="confirm-remove-#{status.index}" 
-                                         tabindex="-1">
-                                        <div class="modal-dialog">
-                                            <form action="#{mvc.uri('UsersController#removeEmailAddress', { 'userIdentifier': user.name, 'emailId': status.index })}" 
-                                                  class="modal-content"
-                                                  method="post">
-                                                <div class="modal-header">
-                                                    <h3 class="modal-title">
-                                                        #{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.title']}
-                                                    </h3>
-                                                    <button aria-label="#{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel']}"  
-                                                            class="close" 
-                                                            data-dismiss="modal" 
-                                                            type="button">
-                                                        <span aria-hidden="true">&times;</span>
-                                                    </button>
-                                                </div>
-                                                <div class="modal-body">
-                                                    #{AdminMessages.getMessage('usergroupsroles.users.user_details.email_addresses.remove.confirm.message', [address.address])}
-                                                    <input name="confirmed" 
-                                                           type="hidden" 
-                                                           value="true" />
-                                                </div>
-                                                <div class="modal-footer">
-                                                    <button class="btn btn-secondary" 
-                                                            data-dismiss="modal" 
-                                                            type="button">
-                                                        #{'usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel'}
-                                                    </button>
-                                                    <button class="btn btn-danger" 
-                                                            data-dismiss="modal" 
-                                                            type="submit">
-                                                        #{'usergroupsroles.users.user_details.email_addresses.remove.confirm.yes'}
-                                                    </button>
-                                                </div>
-                                            </form>
-                                        </div>
-                                    </div>
-                                </td>
+                                <th>
+                                    #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.address']}
+                                </th>
+                                <th class="text-center">
+                                    #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.boucing']}
+                                </th>
+                                <th class="text-center">
+                                    #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.verified']}
+                                </th>
+                                <th class="text-center" colspan="2">
+                                    #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.actions']}
+                                </th>
                             </tr>
-                        </c:forEach>
-                    </thead>
-                </table>
-            </c:if>
+                            <c:forEach items="#{UserDetailsModel.emailAddresses}"
+                                       var="address"
+                                       varStatus="status">
+                                <tr>
+                                    <td>
+                                        #{address.address}
+                                    </td>
+                                    <td>
+                                        <c:choose>
+                                            <c:when test="#{address.bouncing}">
+                                                #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.yes']}
+                                            </c:when>
+                                            <c:otherwise>
+                                                #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.no']}
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </td>
+                                    <td>
+                                        <c:choose>
+                                            <c:when test="#{address.verified}">
+                                                #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.yes']}
+                                            </c:when>
+                                            <c:otherwise>
+                                                #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.no']}
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </td>
+                                    <td>
+                                        <a class="btn btn-info" href="#">
+                                            <svg class="bi"
+                                                 width="1em"
+                                                 height="1em"
+                                                 fill="currentColor">
+                                                <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                                            </svg>
+                                            <span>
+                                                #{AdminMessages['usergroupsroles.users.user_details.email_addresses.edit']}
+                                            </span>
+                                        </a>
+                                    </td>
+                                    <td>
+                                        <button class="btn btn-danger" 
+                                                data-toggle="modal"
+                                                data-target="#confirm-remove-#{status.index}">
+                                            <svg class="bi"
+                                                 width="1em"
+                                                 height="1em"
+                                                 fill="currentColor">
+                                                <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                            </svg>
+                                            <span>
+                                                #{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove']}
+                                            </span>
+                                        </button>
+                                        <div class="modal" 
+                                             id="confirm-remove-#{status.index}" 
+                                             tabindex="-1">
+                                            <div class="modal-dialog">
+                                                <form action="#{mvc.uri('UsersController#removeEmailAddress', { 'userIdentifier': user.name, 'emailId': status.index })}" 
+                                                      class="modal-content"
+                                                      method="post">
+                                                    <div class="modal-header">
+                                                        <h3 class="modal-title">
+                                                            #{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.title']}
+                                                        </h3>
+                                                        <button aria-label="#{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel']}"  
+                                                                class="close" 
+                                                                data-dismiss="modal" 
+                                                                type="button">
+                                                            <span aria-hidden="true">&times;</span>
+                                                        </button>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        #{AdminMessages.getMessage('usergroupsroles.users.user_details.email_addresses.remove.confirm.message', [address.address])}
+                                                        <input name="confirmed" 
+                                                               type="hidden" 
+                                                               value="true" />
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button class="btn btn-secondary" 
+                                                                data-dismiss="modal" 
+                                                                type="button">
+                                                            #{'usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel'}
+                                                        </button>
+                                                        <button class="btn btn-danger" 
+                                                                data-dismiss="modal" 
+                                                                type="submit">
+                                                            #{'usergroupsroles.users.user_details.email_addresses.remove.confirm.yes'}
+                                                        </button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            </c:forEach>
+                        </thead>
+                    </table>
+                </c:when>
+                <c:otherwise>
+                    <div class="alert alert-info" role="alert">
+                        #{AdminMessages['usergroupsroles.users.user_details.email_addresses.none']}
+                    </div>
+                </c:otherwise>
+            </c:choose>
 
-            <c:if test="#{UserDetailsModel.groupMemberships.size() > 0}">
-                <h2>
+            <div class="d-flex mb-1">
+                <h2 class="mr-2">
                     #{AdminMessages['usergroupsroles.users.user_details.groups.heading']}
                 </h2>
-                <a class="btn btn-secondary" href="#">
+                <button class="btn btn-primary" 
+                        data-toggle="modal"
+                        data-target="#user-groups-dialog"
+                        type="button">
                     <svg class="bi"
                          width="1em"
                          height="1em"
                          fill="currentColor">
-                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
+                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
                     </svg>
-                    <span>#{AdminMessages['usergroupsroles.users.user_details.groups.add']}</span>
-                </a>
-                <ul class="list-group mt-1">
-                    <c:forEach items="#{UserDetailsModel.groupMemberships}"
-                               var="group">
-                        <li class="list-group-item d-flex justify-content-between align-items-center">
-                            <a href="#">
-                                #{group.groupName}
-                            </a>
-                            <a class="btn btn-danger" href="#">
-                                <svg class="bi"
-                                     width="1em"
-                                     height="1em"
-                                     fill="currentColor">
-                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                </svg>
-                                <span>
-                                    #{AdminMessages['usergroupsroles.users.user_details.groups.remove']}
-                                </span>
-                            </a>
-                        </li>
-                    </c:forEach>
-                </ul>
-            </c:if>
+                    <span>#{AdminMessages['usergroupsroles.users.user_details.groups.edit']}</span>
+                </button>
+                <div aria-labelledby="user-groups-dialog-title"
+                     aria-hidden="true"
+                     class="modal fade" 
+                     data-backdrop="static"
+                     id="user-groups-dialog" 
+                     tabindex="-1">
+                    <div class="modal-dialog">
+                        <form action="" 
+                              class="modal-content" 
+                              method="post">
+                            <div class="modal-header">
+                                <h3 class="modal-title" 
+                                    id="user-groups-dialog-title">
+                                    #{AdminMessages['usergroupsroles.users.user_details.groups.dialog.title']}
+                                </h3>
+                                <button aria-label="#{AdminMessages['usergroupsroles.users.user_details.groups.dialog.close']}"
+                                        class="close"
+                                        data-dismiss="modal"
+                                        type="button">
+                                    <span aria-hidden="true">&times;</span>
+                                </button>
+                            </div>
+                            <div class="modal-body">
+                                <c:forEach items="#{UserDetailsModel.userGroupsFormEntries}" 
+                                           var="entry">
+                                    <input checked="#{entry.member ? 'checked' : 'false'}"
+                                           id="group-#{entry.groupName}" 
+                                           name="userGroups[]"
+                                           value="#{entry.groupName}"
+                                           type="checkbox" />
+                                </c:forEach>
+                            </div>
+                            <div class="modal-footer">
+                                <button class="btn btn-secondary" 
+                                        data-dismiss="modal"
+                                        type="button" >
+                                    #{AdminMessages['usergroupsroles.users.user_details.groups.dialog.close']}
+                                </button>
+                                <button type="submit" class="btn btn-primary">
+                                    #{AdminMessages['usergroupsroles.users.user_details.groups.dialog.save']}
+                                </button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <c:choose>
+                <c:when test="#{UserDetailsModel.groupMemberships.size() > 0}">
+                    <ul class="list-group mt-1">
+                        <c:forEach items="#{UserDetailsModel.groupMemberships}">
+                            <li class="list-group-item">
+                                <a href="#">
+                                    #{group.groupName}
+                                </a>
+                            </li>
+                        </c:forEach>
+                    </ul>
+                </c:when>
+                <c:otherwise>
+                    <div class="alert alert-info" role="alert">
+                        #{AdminMessages['usergroupsroles.users.user_details.groups.none']}
+                    </div>
+                </c:otherwise>
+            </c:choose>
 
-            <c:if test="#{UserDetailsModel.roles.size() > 0}">
-                <h2>
+            <div class="d-flex mb-1">
+                <h2 class="mr-2">
                     #{AdminMessages['usergroupsroles.users.user_details.roles.heading']}
                 </h2>
-                <a class="btn btn-secondary" href="#">
+                <button class="btn btn-primary" type="button">
                     <svg class="bi"
                          width="1em"
                          height="1em"
                          fill="currentColor">
-                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
+                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
                     </svg>
-                    <span>#{AdminMessages['usergroupsroles.users.user_details.roles.add']}</span>
-                </a>
-                <ul class="list-group mt-1">
-                    <c:forEach items="#{UserDetailsModel.roles}"
-                               var="role">
-                        <li class="list-group-item d-flex justify-content-between align-items-center">
-                            <a href="#">
-                                #{role.roleName}
-                            </a>
-                            <a class="btn btn-danger" href="#">
-                                <svg class="bi"
-                                     width="1em"
-                                     height="1em"
-                                     fill="currentColor">
-                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                </svg>
-                                <span>
-                                    #{AdminMessages['usergroupsroles.users.user_details.roles.remove']}
-                                </span>
-                            </a>
-                        </li>
-                    </c:forEach>
-                </ul>
-            </c:if>
+                    <span>#{AdminMessages['usergroupsroles.users.user_details.roles.edit']}</span>
+                </button>
+            </div>
+
+            <c:choose>
+                <c:when test="#{UserDetailsModel.roles.size() > 0}">
+                    <ul class="list-group mt-1 mb-4">
+                        <c:forEach items="#{UserDetailsModel.roles}" var="role">
+                            <li class="list-group-item">
+                                <a href="#">
+                                    #{role.roleName}
+                                </a>
+                            </li>
+                        </c:forEach>
+                    </ul>
+                </c:when>
+                <c:otherwise>
+                    <div class="alert alert-info" role="alert">
+                        #{AdminMessages['usergroupsroles.users.user_details.roles.none']}
+                    </div>
+                </c:otherwise>
+            </c:choose>
+
         </ui:define>
 
     </ui:composition>
 
-
 </html>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
index 8b124acd1..c23f0e7b5 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 80ef75e86..afe9cd858 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -115,3 +115,12 @@ usergroupsroles.users.user_details.email_addresses.remove.confirm.title=Confirm
 usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel=Cancel
 usergroupsroles.users.user_details.email_addresses.remove.confirm.message=Are you sure to remove email address {0}?
 usergroupsroles.users.user_details.email_addresses.remove.confirm.yes=Remove Email Address
+usergroupsroles.users.user_details.groups.none=This user is not a member of any group
+usergroupsroles.users.user_details.groups.edit=Edit
+usergroupsroles.users.user_details.roles.edit=Edit
+usergroupsroles.users.user_details.roles.none=No roles assigned to this user
+usergroupsroles.users.user_details.email_addresses.none=This user has no additional email addresses
+usergroupsroles.users.user_details.additional_email_addresses.add=Add email address
+usergroupsroles.users.user_details.groups.dialog.title=Edit groupmemberships
+usergroupsroles.users.user_details.groups.dialog.close=Cancel
+usergroupsroles.users.user_details.groups.dialog.save=Save
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index d7ca0fe66..7a3c46481 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -115,3 +115,12 @@ usergroupsroles.users.user_details.email_addresses.remove.confirm.title=Entferne
 usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel=Abbrechen
 usergroupsroles.users.user_details.email_addresses.remove.confirm.message=Sind Sie sicher, dass Sie die E-Mail-Addresse {0} entfernen wollen?
 usergroupsroles.users.user_details.email_addresses.remove.confirm.yes=E-Mail-Addresse entfernen
+usergroupsroles.users.user_details.groups.none=Diese(r) Benutzer*in ist nicht Mitglied einer Gruppe
+usergroupsroles.users.user_details.groups.edit=Bearbeiten
+usergroupsroles.users.user_details.roles.edit=Bearbeiten
+usergroupsroles.users.user_details.roles.none=Dieser(m) Benutzer*in sind keine Rollen zugeordnet
+usergroupsroles.users.user_details.email_addresses.none=Diese(r) Benutzer*in hat keine weiteren E-Mail-Addressen
+usergroupsroles.users.user_details.additional_email_addresses.add=E-Mail-Addresse hinzuf\u00fcgen
+usergroupsroles.users.user_details.groups.dialog.title=Gruppenmitgliedschaften bearbeiten
+usergroupsroles.users.user_details.groups.dialog.close=Abbrechen
+usergroupsroles.users.user_details.groups.dialog.save=Anwenden
diff --git a/ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts b/ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts
index 6fcacc09f..a2cff9960 100644
--- a/ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts
+++ b/ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts
@@ -1 +1,5 @@
-import "bootstrap";
\ No newline at end of file
+import "bootstrap";
+
+import { initFilterables } from "./filterable-list";
+
+document.addEventListener("DOMContentReady", event => initFilterables());
\ No newline at end of file
diff --git a/ccm-core/src/main/typescript/ccm-admin/filterable-list.ts b/ccm-core/src/main/typescript/ccm-admin/filterable-list.ts
new file mode 100644
index 000000000..08af45ca1
--- /dev/null
+++ b/ccm-core/src/main/typescript/ccm-admin/filterable-list.ts
@@ -0,0 +1,135 @@
+export function initFilterables(): void {
+    document
+        .querySelectorAll("*[data-filter]")
+        .forEach(filterable => initFilterable(filterable));
+}
+
+function buildList(
+    filterable: Element,
+    options: Record<string, string>[],
+    template: HTMLTemplateElement,
+    filterInput: HTMLInputElement,
+    filterBy: string[]
+) {
+    console.log("(Re-)Building list...");
+    console.dir(filterOptions);
+    filterable.innerHTML = "";
+
+    const filteredOptions = filterInput.value
+        ? filterOptions(options, filterInput.value, filterBy)
+        : options;
+
+    for (const option of filteredOptions) {
+        const item = template.content.cloneNode(true);
+        replacePlaceholders(item, option);
+        filterable.appendChild(item);
+    }
+}
+
+function filterOption(
+    option: Record<string, string>,
+    filter: string,
+    filterBy: string[]
+) {
+    let result: boolean = false;
+
+    for (const filterByProp of filterBy) {
+        result = result || option[filterByProp].indexOf(filter) !== -1;
+    }
+    return result;
+}
+
+function filterOptions(
+    options: Record<string, string>[],
+    filterValue: string,
+    filterBy: string[]
+) {
+    return options.filter(option =>
+        filterOption(option, filterValue, filterBy)
+    );
+}
+
+function getFilterBy(filterable): string[] {
+    const filterByValue: string = filterable.getAttribute("data-filter-by");
+    if (filterByValue) {
+        return filterByValue.split(",");
+    } else {
+        return [];
+    }
+}
+
+function getFilterInput(filterable): HTMLInputElement {
+    const filterInputId: string = filterable.getAttribute("data-filter");
+    return document.querySelector(`input${filterInputId}`);
+}
+
+function getOptions(filterable: Element): Record<string, string>[] {
+    const attrValue: string = filterable.getAttribute("data-options");
+
+    if (attrValue.startsWith("#")) {
+        const dataScript: Element = document.querySelector(
+            `script${attrValue}`
+        );
+        return JSON.parse(dataScript.textContent);
+    } else {
+        return JSON.parse(attrValue);
+    }
+}
+
+function getTemplate(filterable: Element): HTMLTemplateElement {
+    const templateId: string = filterable.getAttribute("data-template");
+    return document.querySelector(templateId);
+}
+
+function initFilterable(filterable: Element): void {
+    const options: Record<string, string>[] = getOptions(filterable);
+    const template = getTemplate(filterable);
+    const filterInput = getFilterInput(filterable);
+    const filterBy = getFilterBy(filterable);
+
+    filterInput.addEventListener("keyup", event =>
+        buildList(filterable, options, template, filterInput, filterBy)
+    );
+
+    buildList(filterable, options, template, filterInput, filterBy);
+}
+
+function replacePlaceholders(node: Node, data: Record<string, string>) {
+    switch (node.nodeType) {
+        case Node.ELEMENT_NODE: {
+            const childNodes = node.childNodes;
+            for (let i = 0; i < childNodes.length; i++) {
+                replacePlaceholders(childNodes[i], data);
+            }
+            break;
+        }
+        case Node.TEXT_NODE: {
+            for (const key in data) {
+                console.log(`replacing ${key} with ${data[key]}`);
+                node.textContent = node.textContent.replace(
+                    `{{${key}}}`,
+                    data[key]
+                );
+            }
+            break;
+        }
+        case Node.CDATA_SECTION_NODE:
+            return;
+        case Node.DOCUMENT_NODE: {
+            const childNodes = node.childNodes;
+            for (let i = 0; i < childNodes.length; i++) {
+                replacePlaceholders(childNodes[i], data);
+            }
+            break;
+        }
+        case Node.DOCUMENT_FRAGMENT_NODE: {
+            const childNodes = node.childNodes;
+            for (let i = 0; i < childNodes.length; i++) {
+                replacePlaceholders(childNodes[i], data);
+            }
+            break;
+        }
+        default:
+            return;
+    }
+}

From 5b17acd6bfb34442a8e8c1ef9cb5b8191894cb60 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 30 Sep 2020 21:06:47 +0200
Subject: [PATCH 13/93] Bugfixes users administration

---
 .../usersgroupsroles/UserDetailsModel.java    | 28 +++++++
 .../usersgroupsroles/UserFormController.java  | 22 +++++
 .../usersgroupsroles/UserRolesFormEntry.java  | 69 ++++++++++++++++
 .../usersgroupsroles/UsersController.java     |  1 +
 .../UsersGroupsRolesPage.java                 |  1 +
 .../users-groups-roles/user-details.xhtml     | 82 ++++++++++++++++---
 .../admin/users-groups-roles/user-form.xhtml  | 36 ++++----
 .../ui/admin/users-groups-roles/users.xhtml   |  5 +-
 .../org/libreccm/ui/AdminBundle.properties    |  6 +-
 .../org/libreccm/ui/AdminBundle_de.properties | 42 +++++-----
 10 files changed, 243 insertions(+), 49 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserRolesFormEntry.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
index 2dcd27e1b..cc5371138 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
@@ -22,7 +22,9 @@ import org.libreccm.core.EmailAddress;
 import org.libreccm.security.Group;
 import org.libreccm.security.GroupMembership;
 import org.libreccm.security.GroupRepository;
+import org.libreccm.security.Role;
 import org.libreccm.security.RoleMembership;
+import org.libreccm.security.RoleRepository;
 import org.libreccm.security.User;
 import org.libreccm.ui.Message;
 
@@ -47,6 +49,9 @@ public class UserDetailsModel {
     
     @Inject
     private GroupRepository groupRepository;
+    
+    @Inject
+    private RoleRepository roleRepository;
 
     private long userId;
 
@@ -166,6 +171,14 @@ public class UserDetailsModel {
     public List<PartyRoleMembership> getRoles() {
         return Collections.unmodifiableList(roles);
     }
+    
+    public List<UserRolesFormEntry> getUserRolesFormEntries() {
+        return roleRepository
+            .findAll()
+            .stream()
+            .map(this::buildUserRolesFormEntry)
+            .collect(Collectors.toList());
+    }
 
     public boolean isNewUser() {
         return userId == 0;
@@ -185,4 +198,19 @@ public class UserDetailsModel {
         );
         return entry;
     }
+    
+    private UserRolesFormEntry buildUserRolesFormEntry(final Role role) {
+        final UserRolesFormEntry entry = new UserRolesFormEntry();
+        entry.setRoleId(role.getRoleId());
+        entry.setRoleName(role.getName());
+        entry.setRoleUuid(role.getUuid());
+        entry.setMember(
+            roles
+            .stream()
+            .anyMatch(
+                membership -> membership.getRoleUuid().equals(role.getUuid())
+            )
+        );
+        return entry;
+    }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
index 2c713a3ed..677bc41c1 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
@@ -228,5 +228,27 @@ public class UserFormController {
             )
         );
     }
+    
+    @POST
+    @Path("{userIdentifier}/roles")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateRoleMemberships(
+        @PathParam("userIdentifier") final String userIdentifierParam,
+        @FormParam("userRoles") final String[] userRoles
+    ) {
+        // ToDo
+        return String.format(
+            "redirect:%s", 
+            mvc.uri(
+                String.format(
+                    "UsersController#getUserDetails", 
+                    "{userIdentifier: %s}", 
+                    userIdentifierParam
+                )
+            )
+        );
+    }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserRolesFormEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserRolesFormEntry.java
new file mode 100644
index 000000000..2332c3adc
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserRolesFormEntry.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class UserRolesFormEntry {
+    
+    private long roleId;
+    
+    private String roleUuid;
+    
+    private String roleName;
+    
+    private boolean member;
+
+    public long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(final long roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getRoleUuid() {
+        return roleUuid;
+    }
+
+    public void setRoleUuid(final String roleUuid) {
+        this.roleUuid = roleUuid;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(final String roleName) {
+        this.roleName = roleName;
+    }
+
+    public boolean isMember() {
+        return member;
+    }
+
+    public void setMember(final boolean member) {
+        this.member = member;
+    }
+    
+    
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
index f13121cd9..72308a5ff 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
@@ -142,6 +142,7 @@ public class UsersController {
     @Path("/{userIdentifier}/edit")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String editUser(
         @PathParam("userIdentifier") final String userIdentifierParam
     ) {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
index bf32b3afd..e770cd38a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
@@ -40,6 +40,7 @@ public class UsersGroupsRolesPage implements AdminPage {
         classes.add(GroupsController.class);
         classes.add(RolesController.class);
         classes.add(UsersController.class);
+        classes.add(UserFormController.class);
         return classes;
     }
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
index d42af0124..af6a2178b 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -45,7 +45,7 @@
                     <dd>#{UserDetailsModel.givenName}</dd>
                 </div>
                 <div>
-                    <dt>#{AdminMessages['usergroupsroles.users.user_details.family name']}</dt>
+                    <dt>#{AdminMessages['usergroupsroles.users.user_details.family_name']}</dt>
                     <dd>#{UserDetailsModel.familyName}</dd>
                 </div>
                 <div>
@@ -118,7 +118,8 @@
                     </dd>
                 </div>
             </dl>
-            <a class="btn btn-primary" href="#">
+            <a class="btn btn-primary" 
+               href="#{mvc.uri('UsersController#editUser', {'userIdentifier': UserDetailsModel.name })}">
                 <svg class="bi"
                      width="1em"
                      height="1em"
@@ -222,7 +223,7 @@
                                              id="confirm-remove-#{status.index}" 
                                              tabindex="-1">
                                             <div class="modal-dialog">
-                                                <form action="#{mvc.uri('UsersController#removeEmailAddress', { 'userIdentifier': user.name, 'emailId': status.index })}" 
+                                                <form action="#{mvc.uri('UsersController#removeEmailAddress', { 'userIdentifier': UserDetailsModel.name, 'emailId': status.index })}" 
                                                       class="modal-content"
                                                       method="post">
                                                     <div class="modal-header">
@@ -293,7 +294,7 @@
                      id="user-groups-dialog" 
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="" 
+                        <form action="#{mvc.uri('UserFormController#updateGroupMemberships', {'userIdentifier': UserDetailsModel.name})}" 
                               class="modal-content" 
                               method="post">
                             <div class="modal-header">
@@ -311,11 +312,18 @@
                             <div class="modal-body">
                                 <c:forEach items="#{UserDetailsModel.userGroupsFormEntries}" 
                                            var="entry">
-                                    <input checked="#{entry.member ? 'checked' : 'false'}"
-                                           id="group-#{entry.groupName}" 
-                                           name="userGroups[]"
-                                           value="#{entry.groupName}"
-                                           type="checkbox" />
+                                    <div class="form-check form-check-inline">
+                                        <input class="form-check-input"
+                                               checked="#{entry.member ? 'checked' : ''}"
+                                               id="group-#{entry.groupName}" 
+                                               name="userGroups[]"
+                                               value="#{entry.groupName}"
+                                               type="checkbox" />
+                                        <label class="form-check-label"
+                                               for="group-#{entry.groupName}">
+                                            #{entry.groupName}
+                                        </label>
+                                    </div>
                                 </c:forEach>
                             </div>
                             <div class="modal-footer">
@@ -355,7 +363,10 @@
                 <h2 class="mr-2">
                     #{AdminMessages['usergroupsroles.users.user_details.roles.heading']}
                 </h2>
-                <button class="btn btn-primary" type="button">
+                <button class="btn btn-primary" 
+                        data-toggle="modal"
+                        data-target="#user-roles-dialog"
+                        type="button">
                     <svg class="bi"
                          width="1em"
                          height="1em"
@@ -364,6 +375,57 @@
                     </svg>
                     <span>#{AdminMessages['usergroupsroles.users.user_details.roles.edit']}</span>
                 </button>
+                <div aria-labelledby="user-roles-dialog-title"
+                     aria-hidden="true"
+                     class="modal fade"
+                     data-backdrop="static"
+                     id="user-roles-dialog"
+                     tabindex="-1">
+                    <div class="modal-dialog">
+                        <form action="#{mvc.uri('UserFormController#updateRoleMemberships', {'userIdentifier': UserDetailsModel.name })}"
+                              class="modal-content"
+                              method="post">
+                            <div class="modal-header">
+                                <h3 class="model-title"
+                                    id="user-roles-dialog-title">
+                                    #{AdminMessages['usersgroupsroles.users.user_details.roles.dialog.title']}
+                                </h3>
+                                <button aria-label="#{AdminMessages['usersgroupsroles.users.user_details.roles.dialog.close']}"
+                                        class="close"
+                                        data-dismiss="modal"
+                                        type="button">
+                                    <span aria-hidden="true">&times;</span>
+                                </button>
+                            </div>
+                            <div class="modal-body">
+                                <c:forEach items="#{UserDetailsModel.userRolesFormEntries}" 
+                                           var="entry">
+                                    <div class="form-check form-check-inline">
+                                        <input class="form-check-input"
+                                               checked="#{entry.member ? 'checked' : ''}"
+                                               id="role-#{entry.roleName}"
+                                               name="userRoles[]"
+                                               value="#{entry.roleName}"
+                                               type="checkbox" />
+                                        <label for="role#{entry.roleName}">
+                                            #{entry.roleName}
+                                        </label>
+                                    </div>
+                                </c:forEach>
+                            </div>
+                            <div class="modal-footer">
+                                <button class="btn btn-secondary" 
+                                        data-dismiss="modal"
+                                        type="button" >
+                                    #{AdminMessages['usersgroupsroles.users.user_details.roles.dialog.close']}
+                                </button>
+                                <button type="submit" class="btn btn-primary">
+                                    #{AdminMessages['usersgroupsroles.users.user_details.groups.dialog.save']}
+                                </button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
             </div>
 
             <c:choose>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
index 8045f6c47..ceb480028 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
@@ -7,7 +7,7 @@
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="users" />
         <ui:param name="title"
-                  value="#{UserDetailsModel.newUser ? AdminMessages.getMessage('usersgroupsroles.users.edit.title', [UserDetailsModel.name]) : AdminMessages['usersgroupsroles.users.create.title']}" />
+                  value="#{UserDetailsModel.newUser ? AdminMessages['usersgroupsroles.users.create.title'] : AdminMessages.getMessage('usersgroupsroles.users.edit.title', [UserDetailsModel.name]) }" />
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
@@ -26,7 +26,7 @@
                 </a>
             </li>
             <li>
-                
+
                 #{UserDetailsModel.newUser ? AdminMessages['usersgroupsroles.users.breadcrumb.new'] : AdminMessages['usersgroupsroles.users.breadcrumb.edit']}
             </li>
         </ui:define>
@@ -37,7 +37,7 @@
                     #{error}
                 </div>
             </c:forEach>
-            <form action="#{UserDetailsModel.newUser ? mvc.uri("UserFormController#createUser") : mvc.uri('UserFormController#updateUser')}"
+            <form action="#{UserDetailsModel.newUser ? mvc.uri('UserFormController#createUser') : mvc.uri('UserFormController#updateUser', { 'userIdentifier': UserDetailsModel.name })}"
                   method="post">
                 <div class="form-group">
                     <label for="username">
@@ -100,22 +100,23 @@
                     </small>
                 </div>
                 <div class="form-check">
-                    <input class="form-check-input"
+                    <input checked="#{UserDetailsModel.primaryEmailAddress.bouncing ? 'checked' : ''}"
+                           class="form-check-input"
                            id="primary-email-address-bouncing"
                            name="primaryEmailAddressBouncing"
-                           type="checkbox"
-                           value="#{UserDetailsModel.primaryEmailAddress.bouncing}" />
+                           type="checkbox" />
                     <label for="primary-email-address-bouncing">
                         #{AdminMessages['usersgroupsroles.users.form.primaryemailaddress.boucing.label']}
                     </label>
                 </div>
                 <div class="form-check">
-                    <input class="form-check-input"
+                    <input checked="#{UserDetailsModel.primaryEmailAddress.verified ? 'checked' : ''}"
+                           class="form-check-input"
                            id="primary-email-address-verified"
                            name="primaryEmailAddressVerified"
                            type="checkbox"
-                           value="#{UserDetailsModel.primaryEmailAddress.verified}" />
-                    <label for="primary-email-address-bouncing">
+                           />
+                    <label for="primary-email-address-verified">
                         #{AdminMessages['usersgroupsroles.users.form.primaryemailaddress.verified.label']}
                     </label>
                 </div>
@@ -128,7 +129,7 @@
                                class="form-control" 
                                id="password" 
                                name="password" 
-                               type="text" />
+                               type="password" />
                         <small class="form-text text-muted"
                                id="password-help">
                             #{AdminMessages['usersgroupsroles.users.form.password.help']}
@@ -142,7 +143,7 @@
                                class="form-control" 
                                id="password-confirmation" 
                                name="passwordConfirmation" 
-                               type="text" />
+                               type="password" />
                         <small class="form-text text-muted"
                                id="password-help">
                             #{AdminMessages['usersgroupsroles.users.form.passwordconfirmation.help']}
@@ -150,21 +151,21 @@
                     </div>
                 </c:if>
                 <div class="form-check">
-                    <input class="form-check-input"
+                    <input checked="#{UserDetailsModel.banned ? 'checked' : ''}"
+                           class="form-check-input"
                            id="banned"
                            name="banned"
-                           type="checkbox"
-                           value="#{UserDetailsModel.banned}" />
+                           type="checkbox" />
                     <label for="banned">
                         #{AdminMessages['usersgroupsroles.users.form.banned.label']}
                     </label>
                 </div>
                 <div class="form-check">
-                    <input class="form-check-input"
+                    <input checked="#{UserDetailsModel.passwordResetRequired ? 'checked' : ''}"
+                           class="form-check-input"
                            id="password-reset-required"
                            name="passwordResetRequired"
-                           type="checkbox"
-                           value="#{UserDetailsModel.passwordResetRequired}" />
+                           type="checkbox" />
                     <label for="password-reset-required">
                         #{AdminMessages['usersgroupsroles.users.form.passwordresetrequired.label']}
                     </label>
@@ -185,6 +186,7 @@
                 </button>
             </form>
         </ui:define>
+    </ui:composition>
 
 </html>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
index c23f0e7b5..50cdb26f2 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
@@ -43,7 +43,8 @@
                     </form>
                 </div>
                 <div class="col-sm-3 text-right">
-                    <a class="btn btn-secondary" href="#">
+                    <a class="btn btn-secondary" 
+                       href="#{mvc.uri('UsersController#newUser')}">
                         <svg class="bi"
                              width="1em"
                              height="1em"
@@ -116,7 +117,7 @@
                                                 <h3 class="modal-title">
                                                     #{AdminMessages['usersgroupsroles.users.disable.confirm.title']}
                                                 </h3>
-                                                <button aria-label="#{AdminMessages['usersgroupsroles.users.disable.confirm.cancel']}"  
+                                                <button aria-label="#{AdminMessages['usersgroupsroles.users.disable.confirm.cancel']}"
                                                         class="close" 
                                                         data-dismiss="modal" 
                                                         type="button">
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index afe9cd858..bc174b8de 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -121,6 +121,10 @@ usergroupsroles.users.user_details.roles.edit=Edit
 usergroupsroles.users.user_details.roles.none=No roles assigned to this user
 usergroupsroles.users.user_details.email_addresses.none=This user has no additional email addresses
 usergroupsroles.users.user_details.additional_email_addresses.add=Add email address
-usergroupsroles.users.user_details.groups.dialog.title=Edit groupmemberships
+usergroupsroles.users.user_details.groups.dialog.title=Edit group memberships
 usergroupsroles.users.user_details.groups.dialog.close=Cancel
 usergroupsroles.users.user_details.groups.dialog.save=Save
+usersgroupsroles.users.user_details.roles.dialog.title=Edit role memberships
+usersgroupsroles.users.user_details.roles.dialog.close=Cancel
+usersgroupsroles.users.user_details.groups.dialog.save=Save
+usergroupsroles.users.user_details.family_name=Family Name
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 7a3c46481..f3c973815 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -52,8 +52,8 @@ usergroupsroles.users.user_details.disabled.no=Nein
 usergroupsroles.users.user_details.password_reset_required=Neues Password erforderlich?
 usergroupsroles.users.user_details.password_reset_required.yes=Ja
 usergroupsroles.users.user_details.password_reset_required.no=Nein
-usergroupsroles.users.user_details.additional_email_addresses.heading=Weitere E-Mail-Addressen
-'usergroupsroles.users.user_details.additional_email_addresses.cols.address=Addresse
+usergroupsroles.users.user_details.additional_email_addresses.heading=Weitere E-Mail-Adressen
+'usergroupsroles.users.user_details.additional_email_addresses.cols.address=Adresse
 usergroupsroles.users.user_details.additional_email_addresses.cols.boucing=Wird zur\u00fcckgewiesen?
 usergroupsroles.users.user_details.additional_email_addresses.cols.verified=Verifizizert
 usergroupsroles.users.user_details.additional_email_addresses.cols.actions=Aktionen
@@ -79,10 +79,10 @@ usersgroupsroles.users.form.givenname.label=Vorname
 usersgroupsroles.users.form.givenname.help=Vorname des/der Benutzer*in
 usersgroupsroles.users.form.familyname.label=Familienname
 usersgroupsroles.users.form.familyname.help=Familienname des/der Benutzer*in
-usersgroupsroles.users.form.primaryemailaddress.label=Prim\u00e4re E-Mail-Addresse
-usersgroupsroles.users.form.primaryemailaddress.help=Prim\u00e4re E-Mail Addresse des/der Benutzer*in
-usersgroupsroles.users.form.primaryemailaddress.boucing.label=Werden Mails an die prim\u00e4re E-Mail-Addresse zur\u00fcckgewiesen?
-usersgroupsroles.users.form.primaryemailaddress.verified.label=Ist die prim\u00e4re E-Mail-Addresse verifiziert?
+usersgroupsroles.users.form.primaryemailaddress.label=Prim\u00e4re E-Mail-Adresse
+usersgroupsroles.users.form.primaryemailaddress.help=Prim\u00e4re E-Mail Adresse des/der Benutzer*in
+usersgroupsroles.users.form.primaryemailaddress.boucing.label=Werden Mails an die prim\u00e4re E-Mail-Adresse zur\u00fcckgewiesen?
+usersgroupsroles.users.form.primaryemailaddress.verified.label=Ist die prim\u00e4re E-Mail-Adresse verifiziert?
 usersgroupsroles.users.form.password=Passwort
 usersgroupsroles.users.form.password.help=Passwort des neuen Benutzers
 usersgroupsroles.users.form.passwordconfirmation=Passwort-Best\u00e4tigung
@@ -93,16 +93,16 @@ usersgroupsroles.users.form.buttons.cancel=Abbrechen
 usersgroupsroles.users.form.buttons.create=Benutzer*in neu anlegen
 usersgroupsroles.users.form.buttons.save=Speichern
 usersgroupsroles.users.create.title=Neue(n) Benutzer*in anlegen
-usersgroupsroles.users.email.not_found.title=E-Mail Addresse nicht gefunden
-usersgroupsroles.users.email.not_found.message=Benutzer*in {0} hat keine E-Mail-Addresse mit der ID {1}.
+usersgroupsroles.users.email.not_found.title=E-Mail Adresse nicht gefunden
+usersgroupsroles.users.email.not_found.message=Benutzer*in {0} hat keine E-Mail-Adresse mit der ID {1}.
 usersgroupsroles.users.breadcrumb.new=Benutzer*in anlegen
 usersgroupsroles.users.breadcrumb.edit=Benutzer*in bearbeiten
-usersgroupsroles.users.breadcrumbs.email.add=E-Mail-Addresse hinzuf\u00fcgen
-usersgroupsroles.users.breadcrumbs.email.edit=E-Mail-Addresse bearbeiten
-usersgroupsroles.users.email.edit.title=E-Mail Addresse bearbeiten
-usersgroupsroles.users.email.add.title=E-Mail Addresse hinzuf\u00fcgen
-usersgroupsroles.users.email.form.address.label=E-Mail-Addresse
-usersgroupsroles.users.email.form.address.help=Die E-Mail-Addresse
+usersgroupsroles.users.breadcrumbs.email.add=E-Mail-Adresse hinzuf\u00fcgen
+usersgroupsroles.users.breadcrumbs.email.edit=E-Mail-Adresse bearbeiten
+usersgroupsroles.users.email.edit.title=E-Mail Adresse bearbeiten
+usersgroupsroles.users.email.add.title=E-Mail Adresse hinzuf\u00fcgen
+usersgroupsroles.users.email.form.address.label=E-Mail-Adresse
+usersgroupsroles.users.email.form.address.help=Die E-Mail-Adresse
 usersgroupsroles.users.email.form.bouncing.label=Wird zur\u00fcckgewiesen?
 usersgroupsroles.users.email.form.verified.label=Verifiziert
 usersgroupsroles.users.email.form.buttons.add=Hinzuf\u00fcgen
@@ -111,16 +111,20 @@ usersgroupsroles.users.disable.confirm.title=Deaktivierung Benutzer*in best\u00e
 usersgroupsroles.users.disable.confirm.cancel=Abbrechen
 usersgroupsroles.users.disable.confirm.message=Sind Sie sicher das Sie den/die Benutzer*in {0} deaktivieren wollen?
 usersgroupsroles.users.disable.confirm.yes=Benutzer*in deaktivieren
-usergroupsroles.users.user_details.email_addresses.remove.confirm.title=Entfernen E-Mail-Addresse best\u00e4tigen
+usergroupsroles.users.user_details.email_addresses.remove.confirm.title=Entfernen E-Mail-Adresse best\u00e4tigen
 usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel=Abbrechen
-usergroupsroles.users.user_details.email_addresses.remove.confirm.message=Sind Sie sicher, dass Sie die E-Mail-Addresse {0} entfernen wollen?
-usergroupsroles.users.user_details.email_addresses.remove.confirm.yes=E-Mail-Addresse entfernen
+usergroupsroles.users.user_details.email_addresses.remove.confirm.message=Sind Sie sicher, dass Sie die E-Mail-Adresse {0} entfernen wollen?
+usergroupsroles.users.user_details.email_addresses.remove.confirm.yes=E-Mail-Adresse entfernen
 usergroupsroles.users.user_details.groups.none=Diese(r) Benutzer*in ist nicht Mitglied einer Gruppe
 usergroupsroles.users.user_details.groups.edit=Bearbeiten
 usergroupsroles.users.user_details.roles.edit=Bearbeiten
 usergroupsroles.users.user_details.roles.none=Dieser(m) Benutzer*in sind keine Rollen zugeordnet
-usergroupsroles.users.user_details.email_addresses.none=Diese(r) Benutzer*in hat keine weiteren E-Mail-Addressen
-usergroupsroles.users.user_details.additional_email_addresses.add=E-Mail-Addresse hinzuf\u00fcgen
+usergroupsroles.users.user_details.email_addresses.none=Diese(r) Benutzer*in hat keine weiteren E-Mail-Adressen
+usergroupsroles.users.user_details.additional_email_addresses.add=E-Mail-Adresse hinzuf\u00fcgen
 usergroupsroles.users.user_details.groups.dialog.title=Gruppenmitgliedschaften bearbeiten
 usergroupsroles.users.user_details.groups.dialog.close=Abbrechen
 usergroupsroles.users.user_details.groups.dialog.save=Anwenden
+usersgroupsroles.users.user_details.roles.dialog.title=Rollenmitgliedschaften bearbeiten
+usersgroupsroles.users.user_details.roles.dialog.close=Abbrechen
+usersgroupsroles.users.user_details.groups.dialog.save=Anwenden
+usergroupsroles.users.user_details.family_name=Familienname

From 208c4f85b7660867602f5b8e3107f145693c5df9 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Fri, 2 Oct 2020 19:57:28 +0200
Subject: [PATCH 14/93] Bugfixes for user admin UI

---
 .../usersgroupsroles/UsersController.java     |   3 +-
 .../ui/admin/users-groups-roles/users.xhtml   | 110 +++++++++---------
 .../main/typescript/ccm-admin/ccm-admin.ts    |   3 -
 .../typescript/ccm-admin/filterable-list.ts   |   4 +
 4 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
index 72308a5ff..d61cf8743 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
@@ -216,7 +216,8 @@ public class UsersController {
             user.setBanned(true);
             userRepository.save(user);
             return String.format(
-                "redirect:%s", mvc.uri("UsersController#getUsers")
+                //"redirect:%s", mvc.uri("UsersController#getUsers")
+                "redirect:users-groups-roles/users"
             );
         } else {
             userDetailsModel.addMessage(
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
index 50cdb26f2..7cf4fa1e9 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml
@@ -1,7 +1,6 @@
 <!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       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">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
@@ -67,8 +66,9 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <c:forEach items="#{UsersTableModel.users}" var="user">
-                        <tr>
+                    <c:forEach items="#{UsersTableModel.users}" 
+                               var="user">
+                        <tr class="#{user.banned ? 'text-muted' : ''}">
                             <td>#{user.name}</td>
                             <td>#{user.givenName}</td>
                             <td>#{user.familyName}</td>
@@ -93,58 +93,60 @@
                                 </a>
                             </td>
                             <td class="text-center action-col">
-                                <button class="btn btn-danger"
-                                        data-toggle="modal"
-                                        data-target="#confirm-disable-#{user.name}">
-                                    <svg class="bi"
-                                         width="1em"
-                                         height="1em"
-                                         fill="currentColor">
-                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#person-x" />
-                                    </svg>
-                                    <span>
-                                        #{AdminMessages['usersgroupsroles.users.disablebutton.label']}
-                                    </span>
-                                </button>
-                                <div class="modal" 
-                                     id="confirm-disable-#{user.name}" 
-                                     tabindex="-1">
-                                    <div class="modal-dialog">
-                                        <form action="#{mvc.uri('UsersController#disableUser', { 'userIdentifier': user.name })}" 
-                                              class="modal-content"
-                                              method="post">
-                                            <div class="modal-header">
-                                                <h3 class="modal-title">
-                                                    #{AdminMessages['usersgroupsroles.users.disable.confirm.title']}
-                                                </h3>
-                                                <button aria-label="#{AdminMessages['usersgroupsroles.users.disable.confirm.cancel']}"
-                                                        class="close" 
-                                                        data-dismiss="modal" 
-                                                        type="button">
-                                                    <span aria-hidden="true">&times;</span>
-                                                </button>
-                                            </div>
-                                            <div class="modal-body">
-                                                #{AdminMessages.getMessage('usersgroupsroles.users.disable.confirm.message', [user.name])}
-                                                <input name="confirmed" 
-                                                       type="hidden" 
-                                                       value="true" />
-                                            </div>
-                                            <div class="modal-footer">
-                                                <button class="btn btn-secondary" 
-                                                        data-dismiss="modal" 
-                                                        type="button">
-                                                    #{'usersgroupsroles.users.disable.confirm.cancel'}
-                                                </button>
-                                                <button class="btn btn-danger" 
-                                                        data-dismiss="modal" 
-                                                        type="submit">
-                                                    #{'usersgroupsroles.users.disable.confirm.yes'}
-                                                </button>
-                                            </div>
-                                        </form>
+                                <c:if test="#{!user.banned}">
+                                    <button class="btn btn-danger"
+                                            data-toggle="modal"
+                                            data-target="#confirm-disable-#{user.name}">
+                                        <svg class="bi"
+                                             width="1em"
+                                             height="1em"
+                                             fill="currentColor">
+                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#person-x" />
+                                        </svg>
+                                        <span>
+                                            #{AdminMessages['usersgroupsroles.users.disablebutton.label']}
+                                        </span>
+                                    </button>
+                                    <div class="modal" 
+                                         id="confirm-disable-#{user.name}" 
+                                         tabindex="-1">
+                                        <div class="modal-dialog">
+                                            <form action="#{mvc.uri('UsersController#disableUser', { 'userIdentifier': user.name })}" 
+                                                  class="modal-content"
+                                                  method="post">
+                                                <div class="modal-header">
+                                                    <h3 class="modal-title">
+                                                        #{AdminMessages['usersgroupsroles.users.disable.confirm.title']}
+                                                    </h3>
+                                                    <button aria-label="#{AdminMessages['usersgroupsroles.users.disable.confirm.cancel']}"
+                                                            class="close" 
+                                                            data-dismiss="modal" 
+                                                            type="button">
+                                                        <span aria-hidden="true">&times;</span>
+                                                    </button>
+                                                </div>
+                                                <div class="modal-body">
+                                                    #{AdminMessages.getMessage('usersgroupsroles.users.disable.confirm.message', [user.name])}
+                                                    <input name="confirmed" 
+                                                           type="hidden" 
+                                                           value="true" />
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <button class="btn btn-secondary" 
+                                                            data-dismiss="modal" 
+                                                            type="button">
+                                                        #{AdminMessages['usersgroupsroles.users.disable.confirm.cancel']}
+                                                    </button>
+                                                    <button class="btn btn-danger" 
+                                                            data-submit-confirm-dialog="#confirm-disable-#{user.name}"
+                                                            type="submit">
+                                                        #{AdminMessages['usersgroupsroles.users.disable.confirm.yes']}
+                                                    </button>
+                                                </div>
+                                            </form>
+                                        </div>
                                     </div>
-                                </div>
+                                </c:if>
                             </td>
                         </tr>
                     </c:forEach>
diff --git a/ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts b/ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts
index a2cff9960..7eb9154d6 100644
--- a/ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts
+++ b/ccm-core/src/main/typescript/ccm-admin/ccm-admin.ts
@@ -1,5 +1,2 @@
 import "bootstrap";
 
-import { initFilterables } from "./filterable-list";
-
-document.addEventListener("DOMContentReady", event => initFilterables());
\ No newline at end of file
diff --git a/ccm-core/src/main/typescript/ccm-admin/filterable-list.ts b/ccm-core/src/main/typescript/ccm-admin/filterable-list.ts
index 08af45ca1..8a583220c 100644
--- a/ccm-core/src/main/typescript/ccm-admin/filterable-list.ts
+++ b/ccm-core/src/main/typescript/ccm-admin/filterable-list.ts
@@ -1,3 +1,7 @@
+/**
+ * Not ready yet. Don' use
+ */
+
 export function initFilterables(): void {
     document
         .querySelectorAll("*[data-filter]")

From 19d4882a6cde36a2632fceac3337be79d08f4331 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 3 Oct 2020 19:00:23 +0200
Subject: [PATCH 15/93] Bugfixes

---
 .../usersgroupsroles/EmailFormController.java | 47 ++++++++++---------
 .../usersgroupsroles/EmailFormModel.java      | 42 +++++++++++++----
 .../UsersGroupsRolesPage.java                 |  1 +
 .../admin/users-groups-roles/email-form.xhtml |  4 +-
 .../users-groups-roles/user-details.xhtml     |  8 ++--
 5 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
index 6f1bc5e81..df68fb66a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
@@ -74,17 +74,17 @@ public class EmailFormController {
     @Inject
     private UserRepository userRepository;
 
-    @MvcBinding
-    @FormParam("address")
-    @NotBlank
-    @Email
-    private String address;
-
-    @FormParam("bouncing")
-    private boolean bouncing;
-
-    @FormParam("verified")
-    private boolean verified;
+//    @MvcBinding
+//    @FormParam("address")
+//    @NotBlank
+//    @Email
+//    private String address;
+//
+//    @FormParam("bouncing")
+//    private boolean bouncing;
+//
+//    @FormParam("verified")
+//    private boolean verified;
 
     @GET
     @Path("/new")
@@ -94,6 +94,10 @@ public class EmailFormController {
     public String getNewEmailAddressForm(
         @PathParam("userIdentifier") final String userIdentifierParam
     ) {
+        emailFormModel.setUserIdentifier(userIdentifierParam);
+        emailFormModel.setAddress("example@example.org");
+        emailFormModel.setBouncing(false);
+        emailFormModel.setVerified(false);
         return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
     }
 
@@ -129,9 +133,9 @@ public class EmailFormController {
             final User user = result.get();
 
             final EmailAddress emailAddress = new EmailAddress();
-            emailAddress.setAddress(address);
-            emailAddress.setBouncing(bouncing);
-            emailAddress.setVerified(verified);
+            emailAddress.setAddress(emailFormModel.getAddress());
+            emailAddress.setBouncing(emailAddress.isBouncing());
+            emailAddress.setVerified(emailFormModel.isVerified());
             user.addEmailAddress(emailAddress);
 
             userRepository.save(user);
@@ -194,6 +198,7 @@ public class EmailFormController {
                 final EmailAddress emailAddress = user
                     .getEmailAddresses()
                     .get(emailId);
+                emailFormModel.setEmailId(emailId);
                 emailFormModel.setAddress(emailAddress.getAddress());
                 emailFormModel.setBouncing(emailAddress.isBouncing());
                 emailFormModel.setVerified(emailAddress.isVerified());
@@ -213,7 +218,7 @@ public class EmailFormController {
             return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
         }
     }
-    
+
     @POST
     @Path("/{emailId}")
     @AuthorizationRequired
@@ -254,13 +259,13 @@ public class EmailFormController {
                 final EmailAddress emailAddress = user
                     .getEmailAddresses()
                     .get(emailId);
-                
-                emailAddress.setAddress(address);
-                emailAddress.setBouncing(bouncing);
-                emailAddress.setVerified(verified);
-                
+
+                emailAddress.setAddress(emailFormModel.getAddress());
+                emailAddress.setBouncing(emailFormModel.isBouncing());
+                emailAddress.setVerified(emailFormModel.isVerified());
+
                 userRepository.save(user);
-                
+
                 return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
             }
         } else {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
index d85904d25..20f2bd830 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
@@ -27,27 +27,52 @@ import javax.inject.Named;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-
 @RequestScoped
 @Named("EmailFormModel")
 public class EmailFormModel {
+
+    private String userIdentifier;
     
+    private int emailId;
+
     private String address;
-    
+
     private boolean bouncing;
-    
+
     private boolean verified;
-    
-    public void setEmailAddress(final EmailAddress emailAddress) {
+
+    public void setEmailAddress(
+        final String userIdentifier,
+        final int emailId, 
+        final EmailAddress emailAddress
+    ) {
+        this.userIdentifier = userIdentifier;
+        this.emailId = emailId;
         address = emailAddress.getAddress();
         bouncing = emailAddress.isBouncing();
         verified = emailAddress.isVerified();
     }
 
     public boolean isNew() {
-        return address == null;
+        return emailId == 0;
+    }
+
+       public String getUserIdentifier() {
+        return userIdentifier;
+    }
+
+    public void setUserIdentifier(final String userIdentifier) {
+        this.userIdentifier = userIdentifier;
     }
     
+    public int getEmailId() {
+        return emailId;
+    }
+
+    public void setEmailId(final int emailId) {
+        this.emailId = emailId;
+    }
+
     public String getAddress() {
         return address;
     }
@@ -71,6 +96,7 @@ public class EmailFormModel {
     public void setVerified(boolean verified) {
         this.verified = verified;
     }
-    
-    
+
+ 
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
index e770cd38a..7585eac63 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
@@ -41,6 +41,7 @@ public class UsersGroupsRolesPage implements AdminPage {
         classes.add(RolesController.class);
         classes.add(UsersController.class);
         classes.add(UserFormController.class);
+        classes.add(EmailFormController.class);
         return classes;
     }
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
index c57e40915..1b81c451c 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
@@ -25,7 +25,7 @@
                     #{UserDetailsModel.name}
                 </a>
             </li>
-            <li class=breadcrumb-item active"> 
+            <li class="breadcrumb-item active"> 
                 #{EmailFormModel.new ? AdminMessages['usersgroupsroles.users.breadcrumbs.email.add'] : AdminMessages['usersgroupsroles.users.breadcrumbs.email.edit']}
             </li>
         </ui:define>
@@ -36,7 +36,7 @@
                     #{error}
                 </div>
             </c:forEach>
-            <form action="#{EmailFormModel.new ? mvc.uri('EmailFormController#addNewEmailAddress') : mvc.uri('EmailFormController#updateEmailAddress')}"
+            <form action="#{EmailFormModel.new ? mvc.uri('EmailFormController#addNewEmailAddress', {'userIdentifier': EmailFormModel.userIdentifier }) : mvc.uri('EmailFormController#updateEmailAddress', { 'userIdentifier': EmailFormController.userIdentifier, 'emailId': EmailFormModel.emailId })}"
                   method="post">
                 <div class="form-group">
                     <label for="address">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
index af6a2178b..ad196ba5a 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -136,7 +136,8 @@
                     #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.heading']}
                 </h2>
                 <div>
-                    <a class="btn btn-primary" href="#">
+                    <a class="btn btn-primary" 
+                       href="#{mvc.uri('EmailFormController#getNewEmailAddressForm', {'userIdentifier': UserDetailsModel.name })}">
                         <svg class="bi"
                              width="1em"
                              height="1em"
@@ -193,7 +194,8 @@
                                         </c:choose>
                                     </td>
                                     <td>
-                                        <a class="btn btn-info" href="#">
+                                        <a class="btn btn-info" 
+                                           href="#{mvc.uri('UsersController#removeEmailAddress', { 'userIdentifier': UserDetailsModel.name, 'emailId': status.index })}">
                                             <svg class="bi"
                                                  width="1em"
                                                  height="1em"
@@ -223,7 +225,7 @@
                                              id="confirm-remove-#{status.index}" 
                                              tabindex="-1">
                                             <div class="modal-dialog">
-                                                <form action="#{mvc.uri('UsersController#removeEmailAddress', { 'userIdentifier': UserDetailsModel.name, 'emailId': status.index })}" 
+                                                <form action="#" 
                                                       class="modal-content"
                                                       method="post">
                                                     <div class="modal-header">

From 2f9cd0d9c10b7673b2a3d8cdf5d00e5f602e840c Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 5 Oct 2020 21:26:18 +0200
Subject: [PATCH 16/93] Bugfixes

---
 .../main/java/org/libreccm/security/User.java |  45 +-
 .../usersgroupsroles/EmailFormController.java | 412 ++++++++++--------
 .../usersgroupsroles/EmailFormModel.java      |  23 +
 .../usersgroupsroles/UsersController.java     |  82 ++++
 .../admin/users-groups-roles/email-form.xhtml |  25 +-
 .../users-groups-roles/email-not-found.xhtml  |   4 +-
 .../users-groups-roles/user-details.xhtml     |   4 +-
 .../users-groups-roles/user-not-found.xhtml   |   2 +-
 .../org/libreccm/ui/AdminBundle.properties    |   1 +
 .../org/libreccm/ui/AdminBundle_de.properties |   1 +
 10 files changed, 392 insertions(+), 207 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/security/User.java b/ccm-core/src/main/java/org/libreccm/security/User.java
index ce71aa92c..56f4857e2 100644
--- a/ccm-core/src/main/java/org/libreccm/security/User.java
+++ b/ccm-core/src/main/java/org/libreccm/security/User.java
@@ -59,6 +59,7 @@ import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedSubgraph;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
 import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -186,6 +187,7 @@ public class User extends Party implements Serializable, Exportable {
      * Additional email addresses of the user.
      */
     @ElementCollection(fetch = FetchType.EAGER)
+    @OrderBy("address")
     @CollectionTable(name = "USER_EMAIL_ADDRESSES",
                      schema = DB_SCHEMA,
                      joinColumns = {
@@ -363,36 +365,37 @@ public class User extends Party implements Serializable, Exportable {
 
     @Override
     public JsonObjectBuilder buildJson() {
-        final JsonArrayBuilder emailAddressesArrayBuilder = Json.createArrayBuilder();
-        
+        final JsonArrayBuilder emailAddressesArrayBuilder = Json
+            .createArrayBuilder();
+
         emailAddresses
             .stream()
             .map(EmailAddress::buildJson)
             .forEach(emailAddressesArrayBuilder::add);
-        
+
         return super
             .buildJson()
             .add("givenName", givenName)
             .add("familyName", familyName)
             .add("primaryEmailAddress", primaryEmailAddress.buildJson())
-        .add(
-            "emailAddresses", 
-            emailAddresses
-            .stream()
-            .map(EmailAddress::buildJson)
-            .map(JsonObjectBuilder::build)
-            .collect(new JsonArrayCollector())
-        )
-        .add("banned", banned)
-        .add("passwordResetRequired", passwordResetRequired)
-        .add(
-            "groupMemberships",
-            groupMemberships
-            .stream()
-            .map(GroupMembership::buildJson)
-            .map(JsonObjectBuilder::build)
-            .collect(new JsonArrayCollector())
-        );
+            .add(
+                "emailAddresses",
+                emailAddresses
+                    .stream()
+                    .map(EmailAddress::buildJson)
+                    .map(JsonObjectBuilder::build)
+                    .collect(new JsonArrayCollector())
+            )
+            .add("banned", banned)
+            .add("passwordResetRequired", passwordResetRequired)
+            .add(
+                "groupMemberships",
+                groupMemberships
+                    .stream()
+                    .map(GroupMembership::buildJson)
+                    .map(JsonObjectBuilder::build)
+                    .collect(new JsonArrayCollector())
+            );
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
index df68fb66a..d661ff8e5 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
@@ -37,12 +37,9 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
-import javax.mvc.binding.MvcBinding;
+import javax.mvc.binding.BindingResult;
 import javax.transaction.Transactional;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
 import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -53,12 +50,16 @@ import javax.ws.rs.PathParam;
  */
 @RequestScoped
 @Controller
-@Path("/users-groups-roles/users/{userIdentifier}/email-addresses")
+@Path(
+    "/users-groups-roles/users/{userIdentifier}/email-addresses/{emailIdentifier}/save")
 public class EmailFormController {
 
     @Inject
     private AdminMessages adminMessages;
 
+    @Inject
+    private BindingResult bindingResult;
+
     @Inject
     private EmailFormModel emailFormModel;
 
@@ -74,40 +75,27 @@ public class EmailFormController {
     @Inject
     private UserRepository userRepository;
 
-//    @MvcBinding
-//    @FormParam("address")
+    // MVC does not work with Krazo 1.1.0-M1
+//    @MvcBinding 
+    @FormParam("address")
 //    @NotBlank
 //    @Email
-//    private String address;
-//
-//    @FormParam("bouncing")
-//    private boolean bouncing;
-//
-//    @FormParam("verified")
-//    private boolean verified;
+    private String address;
 
-    @GET
-    @Path("/new")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    @Transactional(Transactional.TxType.REQUIRED)
-    public String getNewEmailAddressForm(
-        @PathParam("userIdentifier") final String userIdentifierParam
-    ) {
-        emailFormModel.setUserIdentifier(userIdentifierParam);
-        emailFormModel.setAddress("example@example.org");
-        emailFormModel.setBouncing(false);
-        emailFormModel.setVerified(false);
-        return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
-    }
+    @FormParam("bouncing")
+    private String bouncingParam;
+
+    @FormParam("verified")
+    private String verifiedParam;
 
     @POST
-    @Path("/new")
+    @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
-    public String addNewEmailAddress(
-        @PathParam("userIdentifier") final String userIdentifierParam
+    public String saveEmailAddress(
+        @PathParam("userIdentifier") final String userIdentifierParam,
+        @PathParam("emailIdentifier") final String emailIdentifierParam
     ) {
         final Identifier identifier = identifierParser.parseIdentifier(
             userIdentifierParam
@@ -132,11 +120,86 @@ public class EmailFormController {
         if (result.isPresent()) {
             final User user = result.get();
 
-            final EmailAddress emailAddress = new EmailAddress();
-            emailAddress.setAddress(emailFormModel.getAddress());
-            emailAddress.setBouncing(emailAddress.isBouncing());
-            emailAddress.setVerified(emailFormModel.isVerified());
-            user.addEmailAddress(emailAddress);
+            // MVC Binding does not work with Krazo 1.1.0-M1
+//            if (bindingResult.isFailed()) {
+//                models.put("errors", bindingResult.getAllMessages());
+//              emailFormModel.setUserIdentifier(userIdentifierParam);
+//                emailFormModel.setAddress(address);
+//                emailFormModel.setBouncing(bouncing);
+//                emailFormModel.setVerified(verified);
+//
+//                return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
+//            }
+            if (address == null || address.matches("\\s*")) {
+                emailFormModel.addMessage(
+                    new Message(
+                        "usergroupsroles.users.user_details.email_addresses.errors.address_empty",
+                        MessageType.DANGER)
+                );
+                emailFormModel.setUserIdentifier(userIdentifierParam);
+                emailFormModel.setAddress(address);
+                emailFormModel.setBouncing(bouncingParam != null);
+                emailFormModel.setVerified(verifiedParam != null);
+
+                return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
+            }
+
+            if ("new".equals(emailIdentifierParam)) {
+                return addEmailAddress(user);
+            } else {
+                return updateEmailAddress(
+                    userIdentifierParam,
+                    user,
+                    Integer.parseInt(emailIdentifierParam)
+                );
+            }
+
+        } else {
+            userDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.users.not_found.message",
+                        Arrays.asList(userIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+        }
+    }
+
+    private String addEmailAddress(final User user) {
+        final EmailAddress emailAddress = new EmailAddress();
+        emailAddress.setAddress(address);
+        emailAddress.setBouncing(bouncingParam != null);
+        emailAddress.setVerified(verifiedParam != null);
+        user.addEmailAddress(emailAddress);
+
+        userRepository.save(user);
+
+        return String.format(
+            "redirect:/users-groups-roles/users/%s/details",
+            user.getName()
+        );
+    }
+
+    private String updateEmailAddress(
+        final String userIdentifierParam,
+        final User user,
+        final int emailId
+    ) {
+        if (user.getEmailAddresses().size() <= emailId) {
+            models.put("error.userIdentifier", userIdentifierParam);
+            models.put("error.emailId", emailId);
+            return "org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml";
+        } else {
+            final EmailAddress emailAddress = user
+                .getEmailAddresses()
+                .get(emailId);
+
+            emailAddress.setAddress(address);
+            emailAddress.setBouncing(bouncingParam != null);
+            emailAddress.setVerified(verifiedParam != null);
 
             userRepository.save(user);
 
@@ -144,143 +207,148 @@ public class EmailFormController {
                 "redirect:/users-groups-roles/users/%s/details",
                 user.getName()
             );
-        } else {
-            userDetailsModel.addMessage(
-                new Message(
-                    adminMessages.getMessage(
-                        "usersgroupsroles.users.not_found.message",
-                        Arrays.asList(userIdentifierParam)
-                    ),
-                    MessageType.WARNING
-                )
-            );
-            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
-        }
-    }
-
-    @GET
-    @Path("/{emailId}")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    @Transactional(Transactional.TxType.REQUIRED)
-    public String getEditEmailAddressForm(
-        @PathParam("userIdentifier") final String userIdentifierParam,
-        @PathParam("emailId") final int emailId
-    ) {
-        final Identifier identifier = identifierParser.parseIdentifier(
-            userIdentifierParam
-        );
-        final Optional<User> result;
-        switch (identifier.getType()) {
-            case ID:
-                result = userRepository.findById(
-                    Long.parseLong(identifier.getIdentifier())
-                );
-                break;
-            case UUID:
-                result = userRepository.findByUuid(
-                    identifier.getIdentifier()
-                );
-                break;
-            default:
-                result = userRepository.findByName(identifier.getIdentifier());
-                break;
-        }
-
-        if (result.isPresent()) {
-            final User user = result.get();
-
-            if (user.getEmailAddresses().size() <= emailId) {
-                models.put("error.userIdentifier", userIdentifierParam);
-                models.put("error.emailId", emailId);
-                return "org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml";
-            } else {
-                final EmailAddress emailAddress = user
-                    .getEmailAddresses()
-                    .get(emailId);
-                emailFormModel.setEmailId(emailId);
-                emailFormModel.setAddress(emailAddress.getAddress());
-                emailFormModel.setBouncing(emailAddress.isBouncing());
-                emailFormModel.setVerified(emailAddress.isVerified());
-                return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
-            }
-        } else {
-            userDetailsModel.addMessage(
-                new Message(
-                    adminMessages.getMessage(
-                        "usersgroupsroles.users.not_found.message",
-                        Arrays.asList(userIdentifierParam)
-                    ),
-                    MessageType.WARNING
-                )
-            );
-
-            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
-        }
-    }
-
-    @POST
-    @Path("/{emailId}")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    @Transactional(Transactional.TxType.REQUIRED)
-    public String updateEmailAddress(
-        @PathParam("userIdentifier") final String userIdentifierParam,
-        @PathParam("emailId") final int emailId
-    ) {
-        final Identifier identifier = identifierParser.parseIdentifier(
-            userIdentifierParam
-        );
-        final Optional<User> result;
-        switch (identifier.getType()) {
-            case ID:
-                result = userRepository.findById(
-                    Long.parseLong(identifier.getIdentifier())
-                );
-                break;
-            case UUID:
-                result = userRepository.findByUuid(
-                    identifier.getIdentifier()
-                );
-                break;
-            default:
-                result = userRepository.findByName(identifier.getIdentifier());
-                break;
-        }
-
-        if (result.isPresent()) {
-            final User user = result.get();
-
-            if (user.getEmailAddresses().size() <= emailId) {
-                models.put("error.userIdentifier", userIdentifierParam);
-                models.put("error.emailId", emailId);
-                return "org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml";
-            } else {
-                final EmailAddress emailAddress = user
-                    .getEmailAddresses()
-                    .get(emailId);
-
-                emailAddress.setAddress(emailFormModel.getAddress());
-                emailAddress.setBouncing(emailFormModel.isBouncing());
-                emailAddress.setVerified(emailFormModel.isVerified());
-
-                userRepository.save(user);
-
-                return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
-            }
-        } else {
-            userDetailsModel.addMessage(
-                new Message(
-                    adminMessages.getMessage(
-                        "usersgroupsroles.users.not_found.message",
-                        Arrays.asList(userIdentifierParam)
-                    ),
-                    MessageType.WARNING
-                )
-            );
-
-            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
         }
     }
 
+//    @POST
+//    @Path("/users-groups-roles/users/{userIdentifier}/email-addresses/new")
+//    @AuthorizationRequired
+//    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+//    @Transactional(Transactional.TxType.REQUIRED)
+//    public String addNewEmailAddress(
+//        @PathParam("userIdentifier") final String userIdentifierParam
+//    ) {
+//        final Identifier identifier = identifierParser.parseIdentifier(
+//            userIdentifierParam
+//        );
+//        final Optional<User> result;
+//        switch (identifier.getType()) {
+//            case ID:
+//                result = userRepository.findById(
+//                    Long.parseLong(identifier.getIdentifier())
+//                );
+//                break;
+//            case UUID:
+//                result = userRepository.findByUuid(
+//                    identifier.getIdentifier()
+//                );
+//                break;
+//            default:
+//                result = userRepository.findByName(identifier.getIdentifier());
+//                break;
+//        }
+//
+//        if (result.isPresent()) {
+//            final User user = result.get();
+//
+//            if (bindingResult.isFailed()) {
+//                models.put("errors", bindingResult.getAllMessages());
+//                emailFormModel.setUserIdentifier(userIdentifierParam);
+//                emailFormModel.setAddress(address);
+//                emailFormModel.setBouncing(bouncing);
+//                emailFormModel.setVerified(verified);
+//
+//                return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
+//            }
+//
+//            final EmailAddress emailAddress = new EmailAddress();
+//            emailAddress.setAddress(address);
+//            emailAddress.setBouncing(bouncing);
+//            emailAddress.setVerified(verified);
+//            user.addEmailAddress(emailAddress);
+//
+//            userRepository.save(user);
+//
+//            return String.format(
+//                "redirect:/users-groups-roles/users/%s/details",
+//                user.getName()
+//            );
+//        } else {
+//            userDetailsModel.addMessage(
+//                new Message(
+//                    adminMessages.getMessage(
+//                        "usersgroupsroles.users.not_found.message",
+//                        Arrays.asList(userIdentifierParam)
+//                    ),
+//                    MessageType.WARNING
+//                )
+//            );
+//            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+//        }
+//    }
+//
+//    @POST
+//    @Path("/users-groups-roles/users/{userIdentifier}/email-addresses/{emailId}")
+//    @AuthorizationRequired
+//    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+//    @Transactional(Transactional.TxType.REQUIRED)
+//    public String updateEmailAddress(
+//        @PathParam("userIdentifier") final String userIdentifierParam,
+//        @PathParam("emailId") final int emailId
+//    ) {
+//        final Identifier identifier = identifierParser.parseIdentifier(
+//            userIdentifierParam
+//        );
+//        final Optional<User> result;
+//        switch (identifier.getType()) {
+//            case ID:
+//                result = userRepository.findById(
+//                    Long.parseLong(identifier.getIdentifier())
+//                );
+//                break;
+//            case UUID:
+//                result = userRepository.findByUuid(
+//                    identifier.getIdentifier()
+//                );
+//                break;
+//            default:
+//                result = userRepository.findByName(identifier.getIdentifier());
+//                break;
+//        }
+//
+//        if (result.isPresent()) {
+//            final User user = result.get();
+//
+//            if (bindingResult.isFailed()) {
+//                models.put("errors", bindingResult.getAllMessages());
+//                emailFormModel.setUserIdentifier(userIdentifierParam);
+//                emailFormModel.setEmailId(emailId);
+//                emailFormModel.setAddress(address);
+//                emailFormModel.setBouncing(bouncing);
+//                emailFormModel.setVerified(verified);
+//
+//                return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
+//            }
+//
+//            if (user.getEmailAddresses().size() <= emailId) {
+//                models.put("error.userIdentifier", userIdentifierParam);
+//                models.put("error.emailId", emailId);
+//                return "org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml";
+//            } else {
+//                final EmailAddress emailAddress = user
+//                    .getEmailAddresses()
+//                    .get(emailId);
+//
+//                emailAddress.setAddress(address);
+//                emailAddress.setBouncing(bouncing);
+//                emailAddress.setVerified(verified);
+//
+//                userRepository.save(user);
+//
+//                return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
+//            }
+//        } else {
+//            userDetailsModel.addMessage(
+//                new Message(
+//                    adminMessages.getMessage(
+//                        "usersgroupsroles.users.not_found.message",
+//                        Arrays.asList(userIdentifierParam)
+//                    ),
+//                    MessageType.WARNING
+//                )
+//            );
+//
+//            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+//        }
+//    }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
index 20f2bd830..443da7b23 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
@@ -19,6 +19,11 @@
 package org.libreccm.ui.admin.usersgroupsroles;
 
 import org.libreccm.core.EmailAddress;
+import org.libreccm.ui.Message;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
@@ -40,6 +45,24 @@ public class EmailFormModel {
     private boolean bouncing;
 
     private boolean verified;
+    
+    private List<Message> messages;
+    
+    public EmailFormModel() {
+        this.messages = new ArrayList<>();
+    }
+    
+    public List<Message> getMessages() {
+        return Collections.unmodifiableList(messages);
+    } 
+    
+    public void addMessage(final Message message) {
+        messages.add(message);
+    }
+    
+    public void setMessages(final List<Message> messages) {
+        this.messages = new ArrayList<>(messages);
+    }
 
     public void setEmailAddress(
         final String userIdentifier,
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
index d61cf8743..704800ac4 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
@@ -21,6 +21,7 @@ package org.libreccm.ui.admin.usersgroupsroles;
 import org.libreccm.api.Identifier;
 import org.libreccm.api.IdentifierParser;
 import org.libreccm.core.CoreConstants;
+import org.libreccm.core.EmailAddress;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 import org.libreccm.security.User;
@@ -35,6 +36,7 @@ import java.util.Optional;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.mvc.Models;
 import javax.mvc.MvcContext;
 import javax.transaction.Transactional;
 import javax.ws.rs.DefaultValue;
@@ -57,9 +59,15 @@ public class UsersController {
     @Inject
     private AdminMessages adminMessages;
 
+    @Inject
+    private EmailFormModel emailFormModel;
+
     @Inject
     private IdentifierParser identifierParser;
 
+    @Inject
+    private Models models;
+
     @Inject
     private MvcContext mvc;
 
@@ -233,6 +241,80 @@ public class UsersController {
         }
     }
 
+    @GET
+    @Path("/{userIdentifier}/email-addresses/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String getNewEmailAddressForm(
+        @PathParam("userIdentifier") final String userIdentifierParam
+    ) {
+        emailFormModel.setUserIdentifier(userIdentifierParam);
+        return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
+    }
+
+    @GET
+    @Path("/{userIdentifier}/email-addresses/{emailId}")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String getEditEmailAddressForm(
+        @PathParam("userIdentifier") final String userIdentifierParam,
+        @PathParam("emailId") final int emailId
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            userIdentifierParam
+        );
+        final Optional<User> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = userRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = userRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = userRepository.findByName(identifier.getIdentifier());
+                break;
+        }
+
+        if (result.isPresent()) {
+            final User user = result.get();
+
+            if (user.getEmailAddresses().size() <= emailId) {
+                models.put("errorUserIdentifier", userIdentifierParam);
+                models.put("errorEmailId", emailId);
+                return "org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml";
+            } else {
+                final EmailAddress emailAddress = user
+                    .getEmailAddresses()
+                    .get(emailId);
+                emailFormModel.setUserIdentifier(userIdentifierParam);
+                emailFormModel.setEmailId(emailId);
+                emailFormModel.setAddress(emailAddress.getAddress());
+                emailFormModel.setBouncing(emailAddress.isBouncing());
+                emailFormModel.setVerified(emailAddress.isVerified());
+                return "org/libreccm/ui/admin/users-groups-roles/email-form.xhtml";
+            }
+        } else {
+            userDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.users.not_found.message",
+                        Arrays.asList(userIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+        }
+    }
+
     @POST
     @Path("/{userIdentifier}/email-addresses/{emailId}/remove")
     @AuthorizationRequired
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
index 1b81c451c..a8a5d164b 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-form.xhtml
@@ -7,8 +7,8 @@
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="users" />
         <ui:param name="title"
-                  value="#{EmailFormModel.new ? AdminMessages.getMessage('usersgroupsroles.users.email.edit.title', [UserDetailsModel.name]) : AdminMessages['usersgroupsroles.users.email.add.title']}" />
-        
+                  value="#{EmailFormModel.new ?  AdminMessages['usersgroupsroles.users.email.add.title'] : AdminMessages.getMessage('usersgroupsroles.users.email.edit.title', [UserDetailsModel.name])}" />
+
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
                 <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
@@ -29,14 +29,19 @@
                 #{EmailFormModel.new ? AdminMessages['usersgroupsroles.users.breadcrumbs.email.add'] : AdminMessages['usersgroupsroles.users.breadcrumbs.email.edit']}
             </li>
         </ui:define>
-        
+
         <ui:define name="panel">
             <c:forEach items="#{errors}" var="error">
                 <div class="alert alert-danger" role="alert">
                     #{error}
                 </div>
             </c:forEach>
-            <form action="#{EmailFormModel.new ? mvc.uri('EmailFormController#addNewEmailAddress', {'userIdentifier': EmailFormModel.userIdentifier }) : mvc.uri('EmailFormController#updateEmailAddress', { 'userIdentifier': EmailFormController.userIdentifier, 'emailId': EmailFormModel.emailId })}"
+            <c:forEach items="#{EmailFormModel.messages}" var="message">
+                <div class="alert alert-#{message.messageType}" role="alert">
+                    #{AdminMessages[message]}
+                </div>
+            </c:forEach>
+            <form action="#{EmailFormModel.new ? mvc.uri('EmailFormController#saveEmailAddress', {'userIdentifier': EmailFormModel.userIdentifier, 'emailIdentifier': 'new' }) : mvc.uri('EmailFormController#saveEmailAddress', { 'userIdentifier': EmailFormController.userIdentifier, 'emailIdentifier': EmailFormModel.emailId })}"
                   method="post">
                 <div class="form-group">
                     <label for="address">
@@ -46,6 +51,7 @@
                            class="form-control"
                            id="address"
                            name="address"
+                           required="required"
                            value="#{EmailFormModel.address}"
                            type="email" />
                     <small class="form-text text-muted"
@@ -54,7 +60,8 @@
                     </small>
                 </div>
                 <div class="form-check">
-                    <input class="form-check-input"
+                    <input checked="#{EmailFormModel.bouncing ? 'checked' : ''}"
+                           class="form-check-input"
                            id="bouncing"
                            name="bouncing"
                            type="checkbox"
@@ -64,11 +71,11 @@
                     </label>
                 </div>
                 <div class="form-check">
-                    <input class="form-check-input"
+                    <input checked="#{EmailFormModel.verified ? 'checked' : ''}"
+                           class="form-check-input"
                            id="verified"
                            name="verified"
-                           type="checkbox"
-                           value="#{EmailFormModel.verified}" />
+                           type="checkbox" />
                     <label for="verified">
                         #{AdminMessages['usersgroupsroles.users.email.form.verified.label']}
                     </label>
@@ -85,6 +92,6 @@
                 </button>
             </form>
         </ui:define>
-        
+
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml
index eb93843ca..37aff6e5d 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/email-not-found.xhtml
@@ -7,7 +7,7 @@
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="users" />
         <ui:param name="title"
-                  value="#{AdminMessages('usersgroupsroles.users.email.not_found.title')}" />
+                  value="#{AdminMessages['usersgroupsroles.users.email.not_found.title']}" />
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
@@ -28,7 +28,7 @@
         <ui:define name="panel">
             
                 <div class="alert alert-danger" role="alert">
-                    #{AdminMessages.getMessage('usersgroupsroles.users.email.not_found.message', [models['errors.userIdentifier'], models['errors.emailId']])}
+                    #{AdminMessages.getMessage('usersgroupsroles.users.email.not_found.message', [errorUserIdentifier, errorEmailId])}
                 </div>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
index ad196ba5a..3e870472f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -137,7 +137,7 @@
                 </h2>
                 <div>
                     <a class="btn btn-primary" 
-                       href="#{mvc.uri('EmailFormController#getNewEmailAddressForm', {'userIdentifier': UserDetailsModel.name })}">
+                       href="#{mvc.uri('UsersController#getNewEmailAddressForm', {'userIdentifier': UserDetailsModel.name })}">
                         <svg class="bi"
                              width="1em"
                              height="1em"
@@ -195,7 +195,7 @@
                                     </td>
                                     <td>
                                         <a class="btn btn-info" 
-                                           href="#{mvc.uri('UsersController#removeEmailAddress', { 'userIdentifier': UserDetailsModel.name, 'emailId': status.index })}">
+                                           href="#{mvc.uri('UsersController#getEditEmailAddressForm', { 'userIdentifier': UserDetailsModel.name, 'emailId': status.index })}">
                                             <svg class="bi"
                                                  width="1em"
                                                  height="1em"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml
index 3a059faed..4f4079020 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml
@@ -27,7 +27,7 @@
 
         <ui:define name="panel">
             <c:forEach items="#{UserDetailsModel.messages}" var="message">
-                <div class="alert alert-#{message.type}" role="alert">
+                <div class="alert alert-#{message.messageType}" role="alert">
                     #{message}
                 </div>
             </c:forEach>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index bc174b8de..0a770e0ab 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -128,3 +128,4 @@ usersgroupsroles.users.user_details.roles.dialog.title=Edit role memberships
 usersgroupsroles.users.user_details.roles.dialog.close=Cancel
 usersgroupsroles.users.user_details.groups.dialog.save=Save
 usergroupsroles.users.user_details.family_name=Family Name
+usergroupsroles.users.user_details.email_addresses.errors.address_empty=Address can't be empty
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index f3c973815..67d616282 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -128,3 +128,4 @@ usersgroupsroles.users.user_details.roles.dialog.title=Rollenmitgliedschaften be
 usersgroupsroles.users.user_details.roles.dialog.close=Abbrechen
 usersgroupsroles.users.user_details.groups.dialog.save=Anwenden
 usergroupsroles.users.user_details.family_name=Familienname
+usergroupsroles.users.user_details.email_addresses.errors.address_empty=Die Addresse kann nicht leer sein

From 66c491e9312946800a9381f85954442b50b9f3de Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 5 Oct 2020 21:28:24 +0200
Subject: [PATCH 17/93] Typo

---
 .../libreccm/ui/admin/users-groups-roles/user-details.xhtml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
index 3e870472f..8efee7a7f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -249,12 +249,12 @@
                                                         <button class="btn btn-secondary" 
                                                                 data-dismiss="modal" 
                                                                 type="button">
-                                                            #{'usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel'}
+                                                            #AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel']
                                                         </button>
                                                         <button class="btn btn-danger" 
                                                                 data-dismiss="modal" 
                                                                 type="submit">
-                                                            #{'usergroupsroles.users.user_details.email_addresses.remove.confirm.yes'}
+                                                            #{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.yes']}
                                                         </button>
                                                     </div>
                                                 </form>

From d84245684f80c5833358a689e9662294889c228e Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 6 Oct 2020 08:05:52 +0200
Subject: [PATCH 18/93] JavaDoc for the admin UI (general UI classes, general
 classes for admin UI, users management)

---
 .../libreccm/ui/IsAuthenticatedFilter.java    |  4 +-
 .../main/java/org/libreccm/ui/Message.java    |  9 +++-
 .../java/org/libreccm/ui/MessageType.java     |  4 +-
 .../org/libreccm/ui/MvcLocaleResolver.java    |  4 +-
 .../libreccm/ui/admin/AdminApplication.java   |  7 ++-
 .../org/libreccm/ui/admin/AdminConstants.java |  6 ++-
 .../org/libreccm/ui/admin/AdminMessages.java  | 50 +++++++++++++++++++
 .../java/org/libreccm/ui/admin/AdminPage.java |  7 ++-
 .../org/libreccm/ui/admin/AdminPageModel.java |  5 +-
 .../libreccm/ui/admin/AdminPagesModel.java    | 12 ++++-
 .../org/libreccm/ui/admin/package-info.java   | 22 ++++++++
 .../usersgroupsroles/EmailFormController.java | 11 ++--
 .../usersgroupsroles/EmailFormModel.java      |  7 +--
 .../admin/usersgroupsroles/OverviewModel.java |  3 +-
 .../usersgroupsroles/PartyRoleMembership.java |  3 +-
 .../usersgroupsroles/UserDetailsModel.java    |  3 +-
 .../usersgroupsroles/UserFormController.java  |  3 +-
 .../usersgroupsroles/UserGroupMembership.java |  3 +-
 .../usersgroupsroles/UserGroupsFormEntry.java |  3 +-
 .../usersgroupsroles/UserRolesFormEntry.java  |  3 +-
 .../usersgroupsroles/UsersController.java     |  4 +-
 .../UsersGroupsRolesController.java           |  3 +-
 .../usersgroupsroles/UsersTableModel.java     |  3 +-
 .../admin/usersgroupsroles/package-info.java  | 23 +++++++++
 .../java/org/libreccm/ui/package-info.java    | 22 ++++++++
 25 files changed, 196 insertions(+), 28 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/package-info.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/package-info.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/package-info.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/IsAuthenticatedFilter.java b/ccm-core/src/main/java/org/libreccm/ui/IsAuthenticatedFilter.java
index 037a26ed8..dea89b408 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/IsAuthenticatedFilter.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/IsAuthenticatedFilter.java
@@ -31,7 +31,9 @@ import javax.ws.rs.container.PreMatching;
 import javax.ws.rs.core.Response;
 
 /**
- *
+ * Filter for securing EE MVC UIs. Checks if the current user is authenticated.
+ * If not the user is redirected to the login application.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @PreMatching
diff --git a/ccm-core/src/main/java/org/libreccm/ui/Message.java b/ccm-core/src/main/java/org/libreccm/ui/Message.java
index 916aa2b29..06bab7d56 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/Message.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/Message.java
@@ -19,13 +19,20 @@
 package org.libreccm.ui;
 
 /**
- *
+ * Stores a message to be displayed in the UI.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class Message {
 
+    /**
+     * The message (or the translation key for the message).
+     */
     private final String message;
 
+    /**
+     * The type of the message.
+     */
     private final MessageType messageType;
 
     public Message(String message, MessageType messageType) {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/MessageType.java b/ccm-core/src/main/java/org/libreccm/ui/MessageType.java
index 83f46f005..740f78bdd 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/MessageType.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/MessageType.java
@@ -19,7 +19,9 @@
 package org.libreccm.ui;
 
 /**
- *
+ * Possible message types. The types are equivalent to the contextual classes
+ * of the Bootstrap framework.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public enum MessageType {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/MvcLocaleResolver.java b/ccm-core/src/main/java/org/libreccm/ui/MvcLocaleResolver.java
index ca80dcbfa..23960329d 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/MvcLocaleResolver.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/MvcLocaleResolver.java
@@ -28,7 +28,9 @@ import javax.mvc.locale.LocaleResolver;
 import javax.mvc.locale.LocaleResolverContext;
 
 /**
- *
+ * A locale resolver implementation that simply passes the locale negoiated by
+ * LibreCCM to Jakarta EE MVC.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
index c8bc90169..193aee0e1 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
@@ -30,12 +30,17 @@ import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
 /**
- *
+ * Collects the controllers for the admin application and registers them with
+ * JAX-RS.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @ApplicationPath("/@admin")
 public class AdminApplication extends Application {
 
+    /**
+     * Injection point for the admin pages.
+     */
     @Inject
     private Instance<AdminPage> adminPages;
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminConstants.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminConstants.java
index e8629ce98..6b21d404c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminConstants.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminConstants.java
@@ -19,7 +19,8 @@
 package org.libreccm.ui.admin;
 
 /**
- *
+ * Some constants for the admin application
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class AdminConstants {
@@ -28,6 +29,9 @@ public class AdminConstants {
         // Nothing
     }
     
+    /**
+     * Bundle that provides the translations for the admin application.
+     */
     public static final String ADMIN_BUNDLE = "org.libreccm.ui.AdminBundle";
     
     
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java
index f0af45d4a..998fe8ae4 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminMessages.java
@@ -33,6 +33,18 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 /**
+ * Provides simple access to the messages in the admin bundle. The make it as
+ * easy as possible to access the messages this class is implemented as a map a
+ * made available as named bean. For simple messages, {@code AdminMesssages} can
+ * be used like a map in a facelets template:
+ *
+ * <pre>
+ * #{AdminMessages['some.message.key'])
+ * </pre>
+ *
+ * Messages with placeholders can be retrieved using
+ * {@link #getMessage(java.lang.String, java.util.List)} or
+ * {@link #getMessage(java.lang.String, java.lang.Object[])}.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -40,11 +52,20 @@ import javax.inject.Named;
 @Named("AdminMessages")
 public class AdminMessages extends AbstractMap<String, String> {
 
+    /**
+     * Provides access to the locale negoiated by LibreCCM.
+     */
     @Inject
     private GlobalizationHelper globalizationHelper;
 
+    /**
+     * The {@link ResourceBundle} to use.
+     */
     private ResourceBundle messages;
 
+    /**
+     * Loads the resource bundle.
+     */
     @PostConstruct
     private void init() {
         messages = ResourceBundle.getBundle(
@@ -53,6 +74,13 @@ public class AdminMessages extends AbstractMap<String, String> {
         );
     }
 
+    /**
+     * Retrieves a message from the resource bundle.
+     * 
+     * @param key The key of the message.
+     * @return The translated message or {@code ???message???} if the the key is
+     * not found in the resource bundle (message is replaced with the key).
+     */
     public String getMessage(final String key) {
         if (messages.containsKey(key)) {
             return messages.getString(key);
@@ -61,12 +89,29 @@ public class AdminMessages extends AbstractMap<String, String> {
         }
     }
 
+    /**
+     * Retrieves a message with placeholders.
+     * 
+     * @param key The key of the message.
+     * @param parameters The parameters for the placeholders.
+     * @return The translated message or {@code ???message???} if the the key is
+     * not found in the resource bundle (message is replaced with the key).
+     */
     public String getMessage(
         final String key, final List<Object> parameters
     ) {
         return getMessage(key, parameters.toArray());
     }
 
+    /**
+     * The translated message or {@code ???message???} if the the key is
+     * not found in the resource bundle (message is replaced with the key).
+     * 
+      @param key The key of the message.
+     * @param parameters The parameters for the placeholders.
+     * @return The translated message or {@code ???message???} if the the key is
+     * not found in the resource bundle (message is replaced with the key).
+     */
     public String getMessage(
         final String key, final Object[] parameters
     ) {
@@ -77,6 +122,11 @@ public class AdminMessages extends AbstractMap<String, String> {
         }
     }
 
+    @Override
+    public String get(final Object key) {
+        return get((String) key);
+    }
+    
     public String get(final String key) {
         return getMessage(key);
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
index 9fcf96015..88ed5dbe2 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPage.java
@@ -23,6 +23,8 @@ import java.util.Set;
 import javax.mvc.MvcContext;
 
 /**
+ * Implementations of this interface provide the controllers etc. for an admin
+ * page.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -37,11 +39,12 @@ public interface AdminPage {
 
     /**
      * A identifier to use by {@link MvcContext#uri(java.lang.String)} to
-     * generate the URI of the page. The identifier has the same format as used in JavaDoc:
+     * generate the URI of the page. The identifier has the same format as used
+     * in JavaDoc:
      * <pre>
      *     ControllerSimpleClassName#methodName
      * </pre>
-     * 
+     *
      * @return The identifier to use for generating the URL of the page
      */
     String getUriIdentifier();
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
index 96a7899d3..f8d6ac2b6 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
@@ -19,7 +19,10 @@
 package org.libreccm.ui.admin;
 
 /**
- *
+ * Model for the data of an admin page.
+ * 
+ * @see AdminPage
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class AdminPageModel {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
index 08de0c083..75eca2dea 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
@@ -32,6 +32,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 /**
+ * Model for the available admin pages.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -39,6 +40,9 @@ import javax.inject.Named;
 @Named("AdminPagesModel")
 public class AdminPagesModel {
 
+    /**
+     * Injection point for the admin pages.
+     */
     @Inject
     private Instance<AdminPage> adminPages;
 
@@ -50,6 +54,12 @@ public class AdminPagesModel {
      */
     private final Map<String, ResourceBundle> bundles = new HashMap<>();
 
+    /**
+     * Retrieves the available admin pages and converts them into
+     * {@link AdminPageModel}s for usage in the views.
+     *
+     * @return A list of the available admin pages.
+     */
     public List<AdminPageModel> getAdminPages() {
         return adminPages
             .stream()
@@ -86,7 +96,7 @@ public class AdminPagesModel {
         if (bundles.containsKey(bundleName)) {
             return bundles.get(bundleName);
         } else {
-            final ResourceBundle bundle =  ResourceBundle.getBundle(
+            final ResourceBundle bundle = ResourceBundle.getBundle(
                 bundleName,
                 globalizationHelper.getNegotiatedLocale()
             );
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/package-info.java b/ccm-core/src/main/java/org/libreccm/ui/admin/package-info.java
new file mode 100644
index 000000000..c60a8dc83
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/**
+ * Base classes for the admin application.
+ */
+package org.libreccm.ui.admin;
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
index d661ff8e5..b0868fb54 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
@@ -37,7 +37,6 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
-import javax.mvc.binding.BindingResult;
 import javax.transaction.Transactional;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
@@ -45,21 +44,23 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
+ * Controller managing the post request from the email edit form.
+ *
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
 @Controller
 @Path(
-    "/users-groups-roles/users/{userIdentifier}/email-addresses/{emailIdentifier}/save")
+    "/users-groups-roles/users/{userIdentifier}/email-addresses/{emailIdentifier}/save"
+)
 public class EmailFormController {
 
     @Inject
     private AdminMessages adminMessages;
 
-    @Inject
-    private BindingResult bindingResult;
-
+//    @Inject
+//    private BindingResult bindingResult;
     @Inject
     private EmailFormModel emailFormModel;
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
index 443da7b23..8b7d6b0eb 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormModel.java
@@ -29,7 +29,8 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 
 /**
- *
+ * Model providing the data for the email edit form.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
@@ -38,7 +39,7 @@ public class EmailFormModel {
 
     private String userIdentifier;
     
-    private int emailId;
+    private int emailId = -1;
 
     private String address;
 
@@ -77,7 +78,7 @@ public class EmailFormModel {
     }
 
     public boolean isNew() {
-        return emailId == 0;
+        return emailId == -1;
     }
 
        public String getUserIdentifier() {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/OverviewModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/OverviewModel.java
index 52d958648..9ddf66253 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/OverviewModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/OverviewModel.java
@@ -31,7 +31,8 @@ import javax.inject.Named;
 import javax.transaction.Transactional;
 
 /**
- *
+ * Model for the overview page of the users/groups/roles admin module.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/PartyRoleMembership.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/PartyRoleMembership.java
index 46cbaeec1..5e8ec5058 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/PartyRoleMembership.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/PartyRoleMembership.java
@@ -21,7 +21,8 @@ package org.libreccm.ui.admin.usersgroupsroles;
 import org.libreccm.security.Role;
 
 /**
- *
+ * Model friendly representation of the role membership of a {@link Party}.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class PartyRoleMembership implements Comparable<PartyRoleMembership>{
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
index cc5371138..206ff5f18 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
@@ -40,7 +40,8 @@ import javax.inject.Named;
 import javax.transaction.Transactional;
 
 /**
- *
+ * Model used by the user details view and the user edit form.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
index 677bc41c1..41b9a2fdc 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
@@ -48,7 +48,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
- *
+ * Controller managing the user post requests from the user edit form.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Controller
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java
index 31b48b3aa..3ab997e7d 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java
@@ -21,7 +21,8 @@ package org.libreccm.ui.admin.usersgroupsroles;
 import org.libreccm.security.Group;
 
 /**
- *
+ * Model friendly representation of a group membership of the user.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class UserGroupMembership implements Comparable<UserGroupMembership> {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsFormEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsFormEntry.java
index 06eb026f5..be0d545a5 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsFormEntry.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsFormEntry.java
@@ -19,7 +19,8 @@
 package org.libreccm.ui.admin.usersgroupsroles;
 
 /**
- *
+ * Model for an selectable group in the user groups form.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class UserGroupsFormEntry {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserRolesFormEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserRolesFormEntry.java
index 2332c3adc..24a623aa3 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserRolesFormEntry.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserRolesFormEntry.java
@@ -19,7 +19,8 @@
 package org.libreccm.ui.admin.usersgroupsroles;
 
 /**
- *
+ * Model for an entry of a selectable role in the user roles form.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class UserRolesFormEntry {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
index 704800ac4..8ff095e33 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
@@ -48,7 +48,9 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.QueryParam;
 
 /**
- *
+ * Controller for the user details view and the {@code GET} requests to the 
+ * user edit form.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
index 5011f27a1..70951149a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
@@ -28,7 +28,8 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
 /**
- *
+ * 
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersTableModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersTableModel.java
index e6a0b9c82..26a7250f6 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersTableModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersTableModel.java
@@ -32,7 +32,8 @@ import javax.inject.Named;
 import javax.transaction.Transactional;
 
 /**
- *
+ * Model for the table/list of users.
+ *  
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/package-info.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/package-info.java
new file mode 100644
index 000000000..1866e2d00
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/**
+ * Provides the backend for the user interface for managing users, groups and 
+ * roles.
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
diff --git a/ccm-core/src/main/java/org/libreccm/ui/package-info.java b/ccm-core/src/main/java/org/libreccm/ui/package-info.java
new file mode 100644
index 000000000..5c8f1eeb2
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/**
+ * Utility classes for Jakarta EE MVC based user interfaces.
+ */
+package org.libreccm.ui;

From 14a1a2eb05dab87f96a5289f46c08330ded2b6b9 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 6 Oct 2020 09:10:50 +0200
Subject: [PATCH 19/93] Groups overview

---
 .../usersgroupsroles/GroupsController.java    |  17 ++-
 .../ui/admin/users-groups-roles/groups.xhtml  | 107 +++++++++++++++++-
 .../org/libreccm/ui/AdminBundle.properties    |   9 ++
 .../org/libreccm/ui/AdminBundle_de.properties |   9 ++
 4 files changed, 138 insertions(+), 4 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
index 5c9ddf910..9c98bf7e1 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
@@ -20,10 +20,16 @@ package org.libreccm.ui.admin.usersgroupsroles;
 
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.Group;
+import org.libreccm.security.GroupRepository;
 import org.libreccm.security.RequiresPrivilege;
 
+import java.util.List;
+
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.mvc.Models;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
@@ -33,14 +39,23 @@ import javax.ws.rs.Path;
  */
 @RequestScoped
 @Controller
-@Path("/users-groups-roles/group")
+@Path("/users-groups-roles/groups")
 public class GroupsController {
+    
+    @Inject
+    private GroupRepository groupRepository;
+    
+    @Inject
+    private Models models;
 
     @GET
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String getGroups() {
+        final List<Group> groups = groupRepository.findAll();
+        models.put("groups", groups);
+        
         return "org/libreccm/ui/admin/users-groups-roles/groups.xhtml";
     }
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
index 10a4150f6..7e73a4427 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
@@ -1,8 +1,9 @@
-<!DOCTYPE html>
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       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:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:xlink="http://www.w3.org/1999/xlink">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="groups" />
@@ -21,7 +22,107 @@
         </ui:define>
 
         <ui:define name="panel">
-            <p>Groups placeholder</p>
+            <div class="row mb-2">
+                <div class="col-sm-9">
+
+                </div>
+                <div class="col-sm-3 text-right">
+                    <a class="btn btn-secondary" 
+                       href="#">
+                        <svg class="bi"
+                             width="1em"
+                             height="1em"
+                             fill="currentColor">
+                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
+                        </svg>
+                        <span>#{AdminMessages['usersgroupsroles.groups.add']}</span>
+                    </a>
+                </div>
+            </div>
+            <table class="table table-hover groups-table">
+                <thead class="thead-light">
+                    <tr>
+                        <th>#{AdminMessages['usersgroupsroles.groups.table.headers.groupname']}</th>
+                        <th class="text-center" colspan="2">#{AdminMessages['usersgroupsroles.groups.table.headers.actions']}</th>
+                    </tr>
+                    <tbody>
+                        <c:forEach items="#{groups}"
+                                   var="group">
+                            <tr>
+                                <td>#{group.name}</td>
+                                <td class="text-center action-col">
+                                    <a class="btn btn-info"
+                                       href="#">
+                                        <svg class="bi"
+                                             width="1em"
+                                             height="1em"
+                                             fill="currentColor">
+                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#eye" />
+                                        </svg>
+                                        <span>
+                                            #{AdminMessages['usersgroupsroles.groups.detailslink.label']}
+                                        </span>
+                                    </a>
+                                </td>
+                                <td class="text-center action-col">
+                                    <button class="btn btn-danger"
+                                            data-toggle="modal"
+                                            data-target="#confirm-delete-#{group.name}"
+                                            href="#">
+                                        <svg class="bi"
+                                             width="1em"
+                                             height="1em"
+                                             fill="currentColor">
+                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                        </svg>
+                                        <span>
+                                            #{AdminMessages['usersgroupsroles.groups.delete.button.label']}
+                                        </span>
+                                    </button>
+                                    <div class="modal"
+                                         id="confirm-delete-#{group.name}"
+                                         tabindex="-1">
+                                        <div class="modal-dialog">
+                                            <form action="#"
+                                                  class="modal-content"
+                                                  method="post">
+                                                <div class="modal-header">
+                                                    <h3 class="modal-title">
+                                                        #{AdminMessages['usersgroupsroles.groups.delete.confirm.title']}
+                                                    </h3>
+                                                    <button aria-label="#{AdminMessages['usersgroupsroles.groups.delete.confirm.cancel']}"
+                                                            class="close" 
+                                                            data-dismiss="modal" 
+                                                            type="button">
+                                                        <span aria-hidden="true">&times;</span>
+                                                    </button>
+                                                </div>
+                                                <div class="modal-body">
+                                                    #{AdminMessages.getMessage('usersgroupsroles.groups.delete.confirm.message', [group.name])}
+                                                    <input name="confirmed" 
+                                                           type="hidden" 
+                                                           value="true" />
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <button class="btn btn-secondary"
+                                                            data-dismiss="modal"
+                                                            type="button">
+                                                        #{AdminMessages['usersgroupsroles.groups.delete.confirm.cancel']}
+                                                    </button>
+                                                    <button class="btn btn-danger" 
+                                                            type="submit">
+                                                        #{AdminMessages['usersgroupsroles.groups.delete.confirm.yes']}
+                                                    </button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                    </tbody>
+                </thead>
+            </table>
         </ui:define>
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 0a770e0ab..86a7ec310 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -129,3 +129,12 @@ usersgroupsroles.users.user_details.roles.dialog.close=Cancel
 usersgroupsroles.users.user_details.groups.dialog.save=Save
 usergroupsroles.users.user_details.family_name=Family Name
 usergroupsroles.users.user_details.email_addresses.errors.address_empty=Address can't be empty
+usersgroupsroles.groups.table.headers.groupname=Group
+usersgroupsroles.groups.table.headers.actions=Actions
+usersgroupsroles.groups.detailslink.label=Details
+usersgroupsroles.groups.delete.button.label=Delete
+usersgroupsroles.groups.delete.confirm.title=Delete group
+usersgroupsroles.groups.delete.confirm.cancel=Cancel
+usersgroupsroles.groups.delete.confirm.yes=Delete Group
+usersgroupsroles.groups.delete.confirm.message=Are you sure to delete group {0}?
+usersgroupsroles.groups.add=Add group
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 67d616282..427c3f30c 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -129,3 +129,12 @@ usersgroupsroles.users.user_details.roles.dialog.close=Abbrechen
 usersgroupsroles.users.user_details.groups.dialog.save=Anwenden
 usergroupsroles.users.user_details.family_name=Familienname
 usergroupsroles.users.user_details.email_addresses.errors.address_empty=Die Addresse kann nicht leer sein
+usersgroupsroles.groups.table.headers.groupname=Gruppe
+usersgroupsroles.groups.table.headers.actions=Aktionen
+usersgroupsroles.groups.detailslink.label=Details
+usersgroupsroles.groups.delete.button.label=L\u00f6schen
+usersgroupsroles.groups.delete.confirm.title=Gruppe l\u00f6schen
+usersgroupsroles.groups.delete.confirm.cancel=Abbrechen
+usersgroupsroles.groups.delete.confirm.yes=Gruppe l\u00f6schen
+usersgroupsroles.groups.delete.confirm.message=Sind Sie sicher, dass Sie die Gruppe {0} l\u00f6schen wollen?
+usersgroupsroles.groups.add=Gruppe hinzuf\u00fcgen

From 9c9742bf7e242131a47f10ebb6dcd7771d62aa51 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 12 Oct 2020 19:31:38 +0200
Subject: [PATCH 20/93] Forms for group management (not working yet!)

---
 .../usersgroupsroles/GroupDetailsModel.java   | 116 ++++++++++++++++
 .../usersgroupsroles/GroupUserMembership.java | 113 ++++++++++++++++
 .../usersgroupsroles/UserDetailsModel.java    |   2 +
 .../usersgroupsroles/UserGroupMembership.java |   6 +-
 .../users-groups-roles/group-details.xhtml    | 127 ++++++++++++++++++
 .../admin/users-groups-roles/group-form.xhtml |  76 +++++++++++
 .../users-groups-roles/user-details.xhtml     |  96 ++++++-------
 .../org/libreccm/ui/AdminBundle.properties    | 109 ++++++++-------
 .../org/libreccm/ui/AdminBundle_de.properties | 109 ++++++++-------
 9 files changed, 613 insertions(+), 141 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserMembership.java
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java
new file mode 100644
index 000000000..03d60a62a
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.security.Group;
+import org.libreccm.security.GroupMembership;
+import org.libreccm.security.RoleMembership;
+import org.libreccm.ui.Message;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+import javax.transaction.Transactional;
+
+/**
+ * Model used by the group details form and the group edit form.
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("GroupDetailsModel")
+public class GroupDetailsModel {
+
+    private long groupId;
+
+    private String uuid;
+
+    private String groupName;
+
+    private List<GroupUserMembership> members;
+
+    private List<PartyRoleMembership> roles;
+
+    private final List<Message> messages;
+
+    public GroupDetailsModel() {
+        messages = new ArrayList<>();
+    }
+
+    public List<Message> getMessages() {
+        return Collections.unmodifiableList(messages);
+    }
+
+    public void addMessage(final Message message) {
+        messages.add(message);
+    }
+
+    public long getGroupId() {
+        return groupId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public List<GroupUserMembership> getMembers() {
+        return Collections.unmodifiableList(members);
+    }
+
+    public List<PartyRoleMembership> getRoles() {
+        return Collections.unmodifiableList(roles);
+    }
+
+    @Transactional(Transactional.TxType.REQUIRED)
+    protected void setGroup(final Group group) {
+        Objects.requireNonNull(group);
+
+        groupId = group.getPartyId();
+        uuid = group.getUuid();
+        groupName = group.getName();
+        members = group
+            .getMemberships()
+            .stream()
+            .map(GroupMembership::getMember)
+            .map(GroupUserMembership::new)
+            .sorted()
+            .collect(Collectors.toList());
+        roles = group
+            .getRoleMemberships()
+            .stream()
+            .map(RoleMembership::getRole)
+            .map(PartyRoleMembership::new)
+            .sorted()
+            .collect(Collectors.toList());
+    }
+
+    public boolean isNewGroup() {
+        return groupId == 0;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserMembership.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserMembership.java
new file mode 100644
index 000000000..277f30bef
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserMembership.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.security.User;
+
+/**
+ * Model friendly representation of a member of a group.
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class GroupUserMembership implements Comparable<GroupUserMembership> {
+
+    private long userId;
+
+    private String userUuid;
+
+    private String userName;
+
+    private String primaryEmailAddress;
+
+    private String givenName;
+
+    private String familyName;
+
+    public GroupUserMembership() {
+        // Nothing
+    }
+    
+    public GroupUserMembership(final User user) {
+        userId = user.getPartyId();
+        userUuid = user.getUuid();
+        userName = user.getName();
+        primaryEmailAddress = user.getPrimaryEmailAddress().getAddress();
+        givenName = user.getGivenName();
+        familyName = user.getFamilyName();
+    }
+    
+    public long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(final long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserUuid() {
+        return userUuid;
+    }
+
+    public void setUserUuid(final String userUuid) {
+        this.userUuid = userUuid;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(final String userName) {
+        this.userName = userName;
+    }
+
+    public String getPrimaryEmailAddress() {
+        return primaryEmailAddress;
+    }
+
+    public void setPrimaryEmailAddress(final String primaryEmailAddress) {
+        this.primaryEmailAddress = primaryEmailAddress;
+    }
+
+    public String getGivenName() {
+        return givenName;
+    }
+
+    public void setGivenName(final String givenName) {
+        this.givenName = givenName;
+    }
+
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    public void setFamilyName(final String familyName) {
+        this.familyName = familyName;
+    }
+
+    @Override
+    public int compareTo(final GroupUserMembership other) {
+        int result = userName.compareTo(other.getUserName());
+        if (result == 0) {
+            return primaryEmailAddress.compareTo(other.getPrimaryEmailAddress());
+        } else {
+            return result;
+        }
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
index 206ff5f18..a3a3f2c5c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
@@ -102,6 +102,7 @@ public class UserDetailsModel {
         groupMemberships = user
             .getGroupMemberships()
             .stream()
+            .sorted()
             .map(GroupMembership::getGroup)
             .map(UserGroupMembership::new)
             .collect(Collectors.toList());
@@ -110,6 +111,7 @@ public class UserDetailsModel {
             .stream()
             .map(RoleMembership::getRole)
             .map(PartyRoleMembership::new)
+            .sorted()
             .collect(Collectors.toList());
     }
     
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java
index 3ab997e7d..a96d41d36 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupMembership.java
@@ -38,9 +38,9 @@ public class UserGroupMembership implements Comparable<UserGroupMembership> {
     }
 
     public UserGroupMembership(final Group group) {
-        this.groupId = group.getPartyId();
-        this.groupUuid = group.getUuid();
-        this.groupName = group.getName();
+        groupId = group.getPartyId();
+        groupUuid = group.getUuid();
+        groupName = group.getName();
     }
 
     public long getGroupId() {
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
new file mode 100644
index 000000000..b9e9605f7
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
@@ -0,0 +1,127 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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">
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="users" />
+        <ui:param name="title"
+                  value="#{AdminMessages.getMessage('usersgroupsroles.groups.group_details.title', [GroupDetailsModel.name])}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersController#getGroups')}">
+                    #{AdminMessages['usersgroupsroles.groups.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                #{GroupDetailsModel.name}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <dl>
+                <div>
+                    <dt>#{AdminMessages['usersgroupsroles.groups.group_details.id']}</dt>
+                    <dd>#{GroupDetailsModel.groupId}</dd>
+                </div>
+                <div>
+                    <dt>#{AdminMessages['usersgroupsroles.groups.group_details.uuid']}</dt>
+                    <dd>#{GroupDetailsModel.uuid}</dd>
+                </div>
+                <div>
+                    <dt>#{AdminMessages['usersgroupsroles.groups.group_details.name']}</dt>
+                    <dd>#{GroupDetailsModel.name}</dd>
+                </div>
+            </dl>
+            <a class="btn btn-primary" 
+               href="#{mvc.uri('GroupsController#editGroup', {'groupIdentifier': GroupDetailsModel.name })}">
+                <svg class="bi"
+                     width="1em"
+                     height="1em"
+                     fill="currentColor">
+                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                </svg>
+                <span>
+                    #{AdminMessages['usersgroupsroles.groups.group_details.edit_group']}
+                </span>
+            </a>
+
+            <div class="d-flex mb-1">
+                <h2 class="mr-2">
+                    #{AdminMessages['usersgroupsroles.groups.group_details.members.heading']}
+                </h2>
+                <button class="btn btn-primary" 
+                        data-toggle="modal"
+                        data-target="#group-members-dialog"
+                        type="button">
+                    <svg class="bi"
+                         width="1em"
+                         height="1em"
+                         fill="currentColor">
+                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                    </svg>
+                    <span>#{AdminMessages['usersgroupsroles.groups.group_details.members.edit']}</span>
+                </button>
+                <div aria-labelledby="group-members-dialog-title"
+                     aria-hidden="true"
+                     class="modal fade" 
+                     data-backdrop="static"
+                     id="group-members-dialog" 
+                     tabindex="-1">
+                    <div class="modal-dialog">
+                        <form action="#{mvc.uri('GroupFormController#updateGroupMemberships', {'groupIdentifier': GroupDetailsModel.name})}" 
+                              class="modal-content" 
+                              method="post">
+                            <div class="modal-header">
+                                <h3 class="modal-title" 
+                                    id="group-members-dialog-title">
+                                    #{AdminMessages['usersgroupsroles.groups.group_details.members.dialog.title']}
+                                </h3>
+                                <button aria-label="#{AdminMessages['usersgroupsroles.groups.group_details.members.dialog.close']}"
+                                        class="close"
+                                        data-dismiss="modal"
+                                        type="button">
+                                    <span aria-hidden="true">&times;</span>
+                                </button>
+                            </div>
+                            <div class="modal-body">
+                                <c:forEach items="#{GroupDetailsModel.groupMemberFormEntries}" 
+                                           var="entry">
+                                    <div class="form-check form-check-inline">
+                                        <input class="form-check-input"
+                                               checked="#{entry.member ? 'checked' : ''}"
+                                               id="group-#{entry.userName}" 
+                                               name="groupMembers[]"
+                                               value="#{entry.userName}"
+                                               type="checkbox" />
+                                        <label class="form-check-label"
+                                               for="group-#{entry.userName}">
+                                            #{entry.userName}
+                                        </label>
+                                    </div>
+                                </c:forEach>
+                            </div>
+                            <div class="modal-footer">
+                                <button class="btn btn-secondary" 
+                                        data-dismiss="modal"
+                                        type="button" >
+                                    #{AdminMessages['usersgroupsroles.groups.group_details.members.dialog.close']}
+                                </button>
+                                <button type="submit" class="btn btn-primary">
+                                    #{AdminMessages['usersgroupsroles.groups.group_details.members.dialog.save']}
+                                </button>
+                            </div>
+                        </form>
+                    </div>
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
new file mode 100644
index 000000000..0e08a2cc2
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="users" />
+        <ui:param name="title"
+                  value="#{GroupDetailsModel.newGroup ? AdminMessages['usersgroupsroles.groups.create.title'] : AdminMessages.getMessage('usersgroupsroles.groups.edit.title', [GroupDetailsModel.name]) }" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('GroupsController#getGroup')}">
+                    #{AdminMessages['usersgroupsroles.groups.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvn.uri('GroupsController#getGroupDetails', { 'groupIdentfier': group.name })}">
+                    #{UserDetailsModel.name}
+                </a>
+            </li>
+            <li>
+
+                #{GroupDetailsModel.newGroup ? AdminMessages['usersgroupsroles.groups.breadcrumb.new'] : AdminMessages['usersgroupsroles.groups.breadcrumb.edit']}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <c:forEach items="#{errors}" var="error">
+                <div class="alert alert-danger" role="alert">
+                    #{error}
+                </div>
+            </c:forEach>
+            
+            <form action="#{GroupDetailsModel.newGroup ? mvc.uri('GroupFormController#createGroup') : mvc.uri('GroupFormController#updateGroup', { 'groupIdentifier': GroupDetailsModel.groupName })}"
+                  method="post">
+                <div class="form-group">
+                    <label for="groupname">
+                        #{AdminMessages['usersgroupsroles.groups.form.groupname.label']}
+                    </label>
+                    <input aria-described-by="groupname-help"
+                           class="form-control" 
+                           id="groupname" 
+                           name="groupName" 
+                           value="#{GroupDetailsModel.name}"
+                           type="text" />
+                    <small class="form-text text-muted"
+                           id="groupname-help">
+                        #{AdminMessages['usersgroupsroles.groups.form.username.help']}
+                    </small>
+                </div>
+                <a class="btn btn-warning" 
+                   href="#{mvc.uri('UsersController#getGroups')}">
+                    #{AdminMessages['usersgroupsroles.groups.form.buttons.cancel']}
+                </a>
+                <button class="btn btn-success" type="submit">
+                    <c:choose>
+                        <c:when test="#{UserDetailsModel.newGroup}">
+                            #{AdminMessages['usersgroupsroles.groups.form.buttons.create']}
+                        </c:when>
+                        <c:otherwise>
+                            #{AdminMessages['usersgroupsroles.groups.form.buttons.save']}
+                        </c:otherwise>
+                    </c:choose>
+                </button>
+            </form>
+        </ui:define>
+
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
index 8efee7a7f..68bcf5610 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -29,58 +29,58 @@
         <ui:define name="panel">
             <dl>
                 <div>
-                    <dt>#{AdminMessages['usergroupsroles.users.user_details.id']}</dt>
+                    <dt>#{AdminMessages['usersgroupsroles.users.user_details.id']}</dt>
                     <dd>#{UserDetailsModel.userId}</dd>
                 </div>
                 <div>
-                    <dt>#{AdminMessages['usergroupsroles.users.user_details.uuid']}</dt>
+                    <dt>#{AdminMessages['usersgroupsroles.users.user_details.uuid']}</dt>
                     <dd>#{UserDetailsModel.uuid}</dd>
                 </div>
                 <div>
-                    <dt>#{AdminMessages['usergroupsroles.users.user_details.name']}</dt>
+                    <dt>#{AdminMessages['usersgroupsroles.users.user_details.name']}</dt>
                     <dd>#{UserDetailsModel.name}</dd>
                 </div>
                 <div>
-                    <dt>#{AdminMessages['usergroupsroles.users.user_details.given_name']}</dt>
+                    <dt>#{AdminMessages['usersgroupsroles.users.user_details.given_name']}</dt>
                     <dd>#{UserDetailsModel.givenName}</dd>
                 </div>
                 <div>
-                    <dt>#{AdminMessages['usergroupsroles.users.user_details.family_name']}</dt>
+                    <dt>#{AdminMessages['usersgroupsroles.users.user_details.family_name']}</dt>
                     <dd>#{UserDetailsModel.familyName}</dd>
                 </div>
                 <div>
                     <dt>
-                        #{AdminMessages['usergroupsroles.users.user_details.primary_email_address']}
+                        #{AdminMessages['usersgroupsroles.users.user_details.primary_email_address']}
                     </dt>
                     <dd>
                         <dl>
-                            <dt>#{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.address']}</dt>
+                            <dt>#{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.cols.address']}</dt>
                             <dd>
                                 #{UserDetailsModel.primaryEmailAddress.address}
                             </dd>
                             <dt>
-                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.boucing']}
+                                #{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.cols.boucing']}
                             </dt>
                             <dd>
                                 <c:choose>
                                     <c:when test="#{UserDetailsModel.primaryEmailAddress.bouncing}">
-                                        #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.yes']}
+                                        #{AdminMessages['usersgroupsroles.users.user_details.email_address.bouncing.yes']}
                                     </c:when>
                                     <c:otherwise>
-                                        #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.no']}
+                                        #{AdminMessages['usersgroupsroles.users.user_details.email_address.bouncing.no']}
                                     </c:otherwise>
                                 </c:choose>
                             </dd>
                             <dt>
-                                #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.verified']}
+                                #{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.cols.verified']}
                             </dt>
                             <dd>
                                 <c:choose>
                                     <c:when test="#{UserDetailsModel.primaryEmailAddress.verified}">
-                                        #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.yes']}
+                                        #{AdminMessages['usersgroupsroles.users.user_details.email_address.verified.yes']}
                                     </c:when>
                                     <c:otherwise>
-                                        #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.no']}
+                                        #{AdminMessages['usersgroupsroles.users.user_details.email_address.verified.no']}
                                     </c:otherwise>
                                 </c:choose>
                             </dd>
@@ -89,30 +89,30 @@
                 </div>
                 <div>
                     <dt>
-                        #{AdminMessages['usergroupsroles.users.user_details.disabled']}
+                        #{AdminMessages['usersgroupsroles.users.user_details.disabled']}
                     </dt>
                     <dd>
                         <c:choose >
                             <c:when test="#{UserDetailsModel.banned}">
-                                #{AdminMessages['usergroupsroles.users.user_details.disabled.yes']}
+                                #{AdminMessages['usersgroupsroles.users.user_details.disabled.yes']}
                             </c:when>
                             <c:otherwise>
-                                #{AdminMessages['usergroupsroles.users.user_details.disabled.no']}
+                                #{AdminMessages['usersgroupsroles.users.user_details.disabled.no']}
                             </c:otherwise>
                         </c:choose>
                     </dd>
                 </div>
                 <div>
                     <dt>
-                        #{AdminMessages['usergroupsroles.users.user_details.password_reset_required']}
+                        #{AdminMessages['usersgroupsroles.users.user_details.password_reset_required']}
                     </dt>
                     <dd>
                         <c:choose >
                             <c:when test="#{UserDetailsModel.passwordResetRequired}">
-                                #{AdminMessages['usergroupsroles.users.user_details.password_reset_required.yes']}
+                                #{AdminMessages['usersgroupsroles.users.user_details.password_reset_required.yes']}
                             </c:when>
                             <c:otherwise>
-                                #{AdminMessages['usergroupsroles.users.user_details.password_reset_required.no']}
+                                #{AdminMessages['usersgroupsroles.users.user_details.password_reset_required.no']}
                             </c:otherwise>
                         </c:choose>
                     </dd>
@@ -127,13 +127,13 @@
                     <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
                 </svg>
                 <span>
-                    #{AdminMessages['usergroupsroles.users.user_details.edit_user']}
+                    #{AdminMessages['usersgroupsroles.users.user_details.edit_user']}
                 </span>
             </a>
 
             <div class="d-flex">
                 <h2 class="mr-2">
-                    #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.heading']}
+                    #{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.heading']}
                 </h2>
                 <div>
                     <a class="btn btn-primary" 
@@ -144,7 +144,7 @@
                              fill="currentColor">
                             <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
                         </svg>
-                        <span>#{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.add']}</span>
+                        <span>#{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.add']}</span>
                     </a>
                 </div>
             </div>
@@ -154,16 +154,16 @@
                         <thead class="thead-light">
                             <tr>
                                 <th>
-                                    #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.address']}
+                                    #{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.cols.address']}
                                 </th>
                                 <th class="text-center">
-                                    #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.boucing']}
+                                    #{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.cols.boucing']}
                                 </th>
                                 <th class="text-center">
-                                    #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.verified']}
+                                    #{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.cols.verified']}
                                 </th>
                                 <th class="text-center" colspan="2">
-                                    #{AdminMessages['usergroupsroles.users.user_details.additional_email_addresses.cols.actions']}
+                                    #{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.cols.actions']}
                                 </th>
                             </tr>
                             <c:forEach items="#{UserDetailsModel.emailAddresses}"
@@ -176,20 +176,20 @@
                                     <td>
                                         <c:choose>
                                             <c:when test="#{address.bouncing}">
-                                                #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.yes']}
+                                                #{AdminMessages['usersgroupsroles.users.user_details.email_address.bouncing.yes']}
                                             </c:when>
                                             <c:otherwise>
-                                                #{AdminMessages['usergroupsroles.users.user_details.email_address.bouncing.no']}
+                                                #{AdminMessages['usersgroupsroles.users.user_details.email_address.bouncing.no']}
                                             </c:otherwise>
                                         </c:choose>
                                     </td>
                                     <td>
                                         <c:choose>
                                             <c:when test="#{address.verified}">
-                                                #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.yes']}
+                                                #{AdminMessages['usersgroupsroles.users.user_details.email_address.verified.yes']}
                                             </c:when>
                                             <c:otherwise>
-                                                #{AdminMessages['usergroupsroles.users.user_details.email_address.verified.no']}
+                                                #{AdminMessages['usersgroupsroles.users.user_details.email_address.verified.no']}
                                             </c:otherwise>
                                         </c:choose>
                                     </td>
@@ -203,7 +203,7 @@
                                                 <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
                                             </svg>
                                             <span>
-                                                #{AdminMessages['usergroupsroles.users.user_details.email_addresses.edit']}
+                                                #{AdminMessages['usersgroupsroles.users.user_details.email_addresses.edit']}
                                             </span>
                                         </a>
                                     </td>
@@ -218,7 +218,7 @@
                                                 <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
                                             </svg>
                                             <span>
-                                                #{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove']}
+                                                #{AdminMessages['usersgroupsroles.users.user_details.email_addresses.remove']}
                                             </span>
                                         </button>
                                         <div class="modal" 
@@ -230,9 +230,9 @@
                                                       method="post">
                                                     <div class="modal-header">
                                                         <h3 class="modal-title">
-                                                            #{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.title']}
+                                                            #{AdminMessages['usersgroupsroles.users.user_details.email_addresses.remove.confirm.title']}
                                                         </h3>
-                                                        <button aria-label="#{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel']}"  
+                                                        <button aria-label="#{AdminMessages['usersgroupsroles.users.user_details.email_addresses.remove.confirm.cancel']}"  
                                                                 class="close" 
                                                                 data-dismiss="modal" 
                                                                 type="button">
@@ -240,7 +240,7 @@
                                                         </button>
                                                     </div>
                                                     <div class="modal-body">
-                                                        #{AdminMessages.getMessage('usergroupsroles.users.user_details.email_addresses.remove.confirm.message', [address.address])}
+                                                        #{AdminMessages.getMessage('usersgroupsroles.users.user_details.email_addresses.remove.confirm.message', [address.address])}
                                                         <input name="confirmed" 
                                                                type="hidden" 
                                                                value="true" />
@@ -249,12 +249,12 @@
                                                         <button class="btn btn-secondary" 
                                                                 data-dismiss="modal" 
                                                                 type="button">
-                                                            #AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel']
+                                                            #AdminMessages['usersgroupsroles.users.user_details.email_addresses.remove.confirm.cancel']
                                                         </button>
                                                         <button class="btn btn-danger" 
                                                                 data-dismiss="modal" 
                                                                 type="submit">
-                                                            #{AdminMessages['usergroupsroles.users.user_details.email_addresses.remove.confirm.yes']}
+                                                            #{AdminMessages['usersgroupsroles.users.user_details.email_addresses.remove.confirm.yes']}
                                                         </button>
                                                     </div>
                                                 </form>
@@ -268,14 +268,14 @@
                 </c:when>
                 <c:otherwise>
                     <div class="alert alert-info" role="alert">
-                        #{AdminMessages['usergroupsroles.users.user_details.email_addresses.none']}
+                        #{AdminMessages['usersgroupsroles.users.user_details.email_addresses.none']}
                     </div>
                 </c:otherwise>
             </c:choose>
 
             <div class="d-flex mb-1">
                 <h2 class="mr-2">
-                    #{AdminMessages['usergroupsroles.users.user_details.groups.heading']}
+                    #{AdminMessages['usersgroupsroles.users.user_details.groups.heading']}
                 </h2>
                 <button class="btn btn-primary" 
                         data-toggle="modal"
@@ -287,7 +287,7 @@
                          fill="currentColor">
                         <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
                     </svg>
-                    <span>#{AdminMessages['usergroupsroles.users.user_details.groups.edit']}</span>
+                    <span>#{AdminMessages['usersgroupsroles.users.user_details.groups.edit']}</span>
                 </button>
                 <div aria-labelledby="user-groups-dialog-title"
                      aria-hidden="true"
@@ -302,9 +302,9 @@
                             <div class="modal-header">
                                 <h3 class="modal-title" 
                                     id="user-groups-dialog-title">
-                                    #{AdminMessages['usergroupsroles.users.user_details.groups.dialog.title']}
+                                    #{AdminMessages['usersgroupsroles.users.user_details.groups.dialog.title']}
                                 </h3>
-                                <button aria-label="#{AdminMessages['usergroupsroles.users.user_details.groups.dialog.close']}"
+                                <button aria-label="#{AdminMessages['usersgroupsroles.users.user_details.groups.dialog.close']}"
                                         class="close"
                                         data-dismiss="modal"
                                         type="button">
@@ -332,10 +332,10 @@
                                 <button class="btn btn-secondary" 
                                         data-dismiss="modal"
                                         type="button" >
-                                    #{AdminMessages['usergroupsroles.users.user_details.groups.dialog.close']}
+                                    #{AdminMessages['usersgroupsroles.users.user_details.groups.dialog.close']}
                                 </button>
                                 <button type="submit" class="btn btn-primary">
-                                    #{AdminMessages['usergroupsroles.users.user_details.groups.dialog.save']}
+                                    #{AdminMessages['usersgroupsroles.users.user_details.groups.dialog.save']}
                                 </button>
                             </div>
                         </form>
@@ -356,14 +356,14 @@
                 </c:when>
                 <c:otherwise>
                     <div class="alert alert-info" role="alert">
-                        #{AdminMessages['usergroupsroles.users.user_details.groups.none']}
+                        #{AdminMessages['usersgroupsroles.users.user_details.groups.none']}
                     </div>
                 </c:otherwise>
             </c:choose>
 
             <div class="d-flex mb-1">
                 <h2 class="mr-2">
-                    #{AdminMessages['usergroupsroles.users.user_details.roles.heading']}
+                    #{AdminMessages['usersgroupsroles.users.user_details.roles.heading']}
                 </h2>
                 <button class="btn btn-primary" 
                         data-toggle="modal"
@@ -375,7 +375,7 @@
                          fill="currentColor">
                         <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
                     </svg>
-                    <span>#{AdminMessages['usergroupsroles.users.user_details.roles.edit']}</span>
+                    <span>#{AdminMessages['usersgroupsroles.users.user_details.roles.edit']}</span>
                 </button>
                 <div aria-labelledby="user-roles-dialog-title"
                      aria-hidden="true"
@@ -444,7 +444,7 @@
                 </c:when>
                 <c:otherwise>
                     <div class="alert alert-info" role="alert">
-                        #{AdminMessages['usergroupsroles.users.user_details.roles.none']}
+                        #{AdminMessages['usersgroupsroles.users.user_details.roles.none']}
                     </div>
                 </c:otherwise>
             </c:choose>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 86a7ec310..01f32ea41 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -40,36 +40,36 @@ usersgroupsroles.users.filter.label=Filter users
 usersgroupsroles.users.filter.submit=Submit
 usersgroupsroles.users.not_found.title=User not found
 usersgroupsroles.users.user_details.title=User {0} Details
-usergroupsroles.users.user_details.id=User ID
-usergroupsroles.users.user_details.uuid=UUID
-usergroupsroles.users.user_details.name=Name
-usergroupsroles.users.user_details.given_name=Given name
-usergroupsroles.users.user_details.familyname=Familyname
-usergroupsroles.users.user_details.primary_email_address=Primary email address
-usergroupsroles.users.user_details.disabled=Disabled?
-usergroupsroles.users.user_details.disabled.yes=Yes
-usergroupsroles.users.user_details.disabled.no=No
-usergroupsroles.users.user_details.password_reset_required=Password reset required?
-usergroupsroles.users.user_details.password_reset_required.yes=Yes
-usergroupsroles.users.user_details.password_reset_required.no=No
-usergroupsroles.users.user_details.additional_email_addresses.heading=Additional email addresses
-'usergroupsroles.users.user_details.additional_email_addresses.cols.address=Address
-usergroupsroles.users.user_details.additional_email_addresses.cols.boucing=Bouncing?
-usergroupsroles.users.user_details.additional_email_addresses.cols.verified=Verified
-usergroupsroles.users.user_details.additional_email_addresses.cols.actions=Actions
-usergroupsroles.users.user_details.email_address.bouncing.yes=Yes
-usergroupsroles.users.user_details.email_address.bouncing.no=No
-usergroupsroles.users.user_details.email_address.verified.yes=Yes
-usergroupsroles.users.user_details.email_address.verified.no=No
-usergroupsroles.users.user_details.email_addresses.remove=Remove
-usergroupsroles.users.user_details.email_addresses.edit=Edit
-usergroupsroles.users.user_details.groups.heading=Groups Memberships
-usergroupsroles.users.user_details.groups.add=Add
-usergroupsroles.users.user_details.groups.remove=Remove
-usergroupsroles.users.user_details.roles.heading=Roles
-usergroupsroles.users.user_details.roles.add=Add
-usergroupsroles.users.user_details.roles.remove=Remove
-usergroupsroles.users.user_details.edit_user=Edit
+usersgroupsroles.users.user_details.id=User ID
+usersgroupsroles.users.user_details.uuid=UUID
+usersgroupsroles.users.user_details.name=Name
+usersgroupsroles.users.user_details.given_name=Given name
+usersgroupsroles.users.user_details.familyname=Familyname
+usersgroupsroles.users.user_details.primary_email_address=Primary email address
+usersgroupsroles.users.user_details.disabled=Disabled?
+usersgroupsroles.users.user_details.disabled.yes=Yes
+usersgroupsroles.users.user_details.disabled.no=No
+usersgroupsroles.users.user_details.password_reset_required=Password reset required?
+usersgroupsroles.users.user_details.password_reset_required.yes=Yes
+usersgroupsroles.users.user_details.password_reset_required.no=No
+usersgroupsroles.users.user_details.additional_email_addresses.heading=Additional email addresses
+'usersgroupsroles.users.user_details.additional_email_addresses.cols.address=Address
+usersgroupsroles.users.user_details.additional_email_addresses.cols.boucing=Bouncing?
+usersgroupsroles.users.user_details.additional_email_addresses.cols.verified=Verified
+usersgroupsroles.users.user_details.additional_email_addresses.cols.actions=Actions
+usersgroupsroles.users.user_details.email_address.bouncing.yes=Yes
+usersgroupsroles.users.user_details.email_address.bouncing.no=No
+usersgroupsroles.users.user_details.email_address.verified.yes=Yes
+usersgroupsroles.users.user_details.email_address.verified.no=No
+usersgroupsroles.users.user_details.email_addresses.remove=Remove
+usersgroupsroles.users.user_details.email_addresses.edit=Edit
+usersgroupsroles.users.user_details.groups.heading=Groups Memberships
+usersgroupsroles.users.user_details.groups.add=Add
+usersgroupsroles.users.user_details.groups.remove=Remove
+usersgroupsroles.users.user_details.roles.heading=Roles
+usersgroupsroles.users.user_details.roles.add=Add
+usersgroupsroles.users.user_details.roles.remove=Remove
+usersgroupsroles.users.user_details.edit_user=Edit
 usersgroupsroles.users.new.errors.password.empty=Password of a new user can't be empty
 usersgroupsroles.users.new.errors.password.no_match=Password and confirmation do not match
 usersgroupsroles.users.edit.title=Edit user {0}
@@ -111,24 +111,24 @@ usersgroupsroles.users.disable.confirm.title=Confirm to disable user
 usersgroupsroles.users.disable.confirm.cancel=Cancel
 usersgroupsroles.users.disable.confirm.message=Are you sure to disable user {0}
 usersgroupsroles.users.disable.confirm.yes=Disable User
-usergroupsroles.users.user_details.email_addresses.remove.confirm.title=Confirm Removal Of Email Address
-usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel=Cancel
-usergroupsroles.users.user_details.email_addresses.remove.confirm.message=Are you sure to remove email address {0}?
-usergroupsroles.users.user_details.email_addresses.remove.confirm.yes=Remove Email Address
-usergroupsroles.users.user_details.groups.none=This user is not a member of any group
-usergroupsroles.users.user_details.groups.edit=Edit
-usergroupsroles.users.user_details.roles.edit=Edit
-usergroupsroles.users.user_details.roles.none=No roles assigned to this user
-usergroupsroles.users.user_details.email_addresses.none=This user has no additional email addresses
-usergroupsroles.users.user_details.additional_email_addresses.add=Add email address
-usergroupsroles.users.user_details.groups.dialog.title=Edit group memberships
-usergroupsroles.users.user_details.groups.dialog.close=Cancel
-usergroupsroles.users.user_details.groups.dialog.save=Save
+usersgroupsroles.users.user_details.email_addresses.remove.confirm.title=Confirm Removal Of Email Address
+usersgroupsroles.users.user_details.email_addresses.remove.confirm.cancel=Cancel
+usersgroupsroles.users.user_details.email_addresses.remove.confirm.message=Are you sure to remove email address {0}?
+usersgroupsroles.users.user_details.email_addresses.remove.confirm.yes=Remove Email Address
+usersgroupsroles.users.user_details.groups.none=This user is not a member of any group
+usersgroupsroles.users.user_details.groups.edit=Edit
+usersgroupsroles.users.user_details.roles.edit=Edit
+usersgroupsroles.users.user_details.roles.none=No roles assigned to this user
+usersgroupsroles.users.user_details.email_addresses.none=This user has no additional email addresses
+usersgroupsroles.users.user_details.additional_email_addresses.add=Add email address
+usersgroupsroles.users.user_details.groups.dialog.title=Edit group memberships
+usersgroupsroles.users.user_details.groups.dialog.close=Cancel
+usersgroupsroles.users.user_details.groups.dialog.save=Save
 usersgroupsroles.users.user_details.roles.dialog.title=Edit role memberships
 usersgroupsroles.users.user_details.roles.dialog.close=Cancel
 usersgroupsroles.users.user_details.groups.dialog.save=Save
-usergroupsroles.users.user_details.family_name=Family Name
-usergroupsroles.users.user_details.email_addresses.errors.address_empty=Address can't be empty
+usersgroupsroles.users.user_details.family_name=Family Name
+usersgroupsroles.users.user_details.email_addresses.errors.address_empty=Address can't be empty
 usersgroupsroles.groups.table.headers.groupname=Group
 usersgroupsroles.groups.table.headers.actions=Actions
 usersgroupsroles.groups.detailslink.label=Details
@@ -138,3 +138,22 @@ usersgroupsroles.groups.delete.confirm.cancel=Cancel
 usersgroupsroles.groups.delete.confirm.yes=Delete Group
 usersgroupsroles.groups.delete.confirm.message=Are you sure to delete group {0}?
 usersgroupsroles.groups.add=Add group
+usersgroupsroles.groups.create.title=Create new group
+usersgroupsroles.groups.edit.title=Edit group {0}
+usersgroupsroles.groups.breadcrumb.new=New Group
+usersgroupsroles.groups.breadcrumb.edit=Edit Group
+usersgroupsroles.groups.form.groupname.label=Group Name
+usersgroupsroles.groups.form.username.help=Unique name of the group
+usersgroupsroles.groups.form.buttons.cancel=Cancel
+usersgroupsroles.groups.form.buttons.create=Create new group
+usersgroupsroles.groups.form.buttons.save=Save
+usersgroupsroles.groups.group_details.title=Details of Group {0}
+usersgroupsroles.groups.group_details.id=Group ID
+usersgroupsroles.groups.group_details.uuid=Group UUID 
+usersgroupsroles.groups.group_details.name=Group Name
+usersgroupsroles.groups.group_details.edit_group=Edit group
+usersgroupsroles.groups.group_details.members.heading=Members
+usersgroupsroles.groups.group_details.members.edit=Add/remove members
+usersgroupsroles.groups.group_details.members.dialog.title=Add/remove members
+usersgroupsroles.groups.group_details.members.dialog.close=Cancel
+usersgroupsroles.groups.group_details.members.dialog.save=Apply
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 427c3f30c..f424bf9a3 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -40,36 +40,36 @@ usersgroupsroles.users.filter.label=Benutzer*innen filtern
 usersgroupsroles.users.filter.submit=Anwenden
 usersgroupsroles.users.not_found.title=Benutzer*in nicht gefunden
 usersgroupsroles.users.user_details.title=Details Benutzer*in {0}
-usergroupsroles.users.user_details.id=Benutzer*in ID
-usergroupsroles.users.user_details.uuid=UUID
-usergroupsroles.users.user_details.name=Name
-usergroupsroles.users.user_details.given_name=Vorname
-usergroupsroles.users.user_details.familyname=Familienname
-usergroupsroles.users.user_details.primary_email_address=Prim\u00e4re E-Mail-Adresse
-usergroupsroles.users.user_details.disabled=Inaktiv?
-usergroupsroles.users.user_details.disabled.yes=Ja
-usergroupsroles.users.user_details.disabled.no=Nein
-usergroupsroles.users.user_details.password_reset_required=Neues Password erforderlich?
-usergroupsroles.users.user_details.password_reset_required.yes=Ja
-usergroupsroles.users.user_details.password_reset_required.no=Nein
-usergroupsroles.users.user_details.additional_email_addresses.heading=Weitere E-Mail-Adressen
-'usergroupsroles.users.user_details.additional_email_addresses.cols.address=Adresse
-usergroupsroles.users.user_details.additional_email_addresses.cols.boucing=Wird zur\u00fcckgewiesen?
-usergroupsroles.users.user_details.additional_email_addresses.cols.verified=Verifizizert
-usergroupsroles.users.user_details.additional_email_addresses.cols.actions=Aktionen
-usergroupsroles.users.user_details.email_address.bouncing.yes=Ja
-usergroupsroles.users.user_details.email_address.bouncing.no=Nein
-usergroupsroles.users.user_details.email_address.verified.yes=Ja
-usergroupsroles.users.user_details.email_address.verified.no=Nein
-usergroupsroles.users.user_details.email_addresses.remove=Entfernen
-usergroupsroles.users.user_details.email_addresses.edit=Bearbeiten
-usergroupsroles.users.user_details.groups.heading=Gruppenmitgliedschaften
-usergroupsroles.users.user_details.groups.add=Hinzuf\u00fcgen
-usergroupsroles.users.user_details.groups.remove=Entfernen
-usergroupsroles.users.user_details.roles.heading=Rollen
-usergroupsroles.users.user_details.roles.add=Hinzuf\u00fcgen
-usergroupsroles.users.user_details.roles.remove=Entfernen
-usergroupsroles.users.user_details.edit_user=Bearbeiten
+usersgroupsroles.users.user_details.id=Benutzer*in ID
+usersgroupsroles.users.user_details.uuid=UUID
+usersgroupsroles.users.user_details.name=Name
+usersgroupsroles.users.user_details.given_name=Vorname
+usersgroupsroles.users.user_details.familyname=Familienname
+usersgroupsroles.users.user_details.primary_email_address=Prim\u00e4re E-Mail-Adresse
+usersgroupsroles.users.user_details.disabled=Inaktiv?
+usersgroupsroles.users.user_details.disabled.yes=Ja
+usersgroupsroles.users.user_details.disabled.no=Nein
+usersgroupsroles.users.user_details.password_reset_required=Neues Password erforderlich?
+usersgroupsroles.users.user_details.password_reset_required.yes=Ja
+usersgroupsroles.users.user_details.password_reset_required.no=Nein
+usersgroupsroles.users.user_details.additional_email_addresses.heading=Weitere E-Mail-Adressen
+'usersgroupsroles.users.user_details.additional_email_addresses.cols.address=Adresse
+usersgroupsroles.users.user_details.additional_email_addresses.cols.boucing=Wird zur\u00fcckgewiesen?
+usersgroupsroles.users.user_details.additional_email_addresses.cols.verified=Verifizizert
+usersgroupsroles.users.user_details.additional_email_addresses.cols.actions=Aktionen
+usersgroupsroles.users.user_details.email_address.bouncing.yes=Ja
+usersgroupsroles.users.user_details.email_address.bouncing.no=Nein
+usersgroupsroles.users.user_details.email_address.verified.yes=Ja
+usersgroupsroles.users.user_details.email_address.verified.no=Nein
+usersgroupsroles.users.user_details.email_addresses.remove=Entfernen
+usersgroupsroles.users.user_details.email_addresses.edit=Bearbeiten
+usersgroupsroles.users.user_details.groups.heading=Gruppenmitgliedschaften
+usersgroupsroles.users.user_details.groups.add=Hinzuf\u00fcgen
+usersgroupsroles.users.user_details.groups.remove=Entfernen
+usersgroupsroles.users.user_details.roles.heading=Rollen
+usersgroupsroles.users.user_details.roles.add=Hinzuf\u00fcgen
+usersgroupsroles.users.user_details.roles.remove=Entfernen
+usersgroupsroles.users.user_details.edit_user=Bearbeiten
 usersgroupsroles.users.new.errors.password.empty=Das Passwort eines neuen Benutzers darf nicht leer sein.
 usersgroupsroles.users.new.errors.password.no_match=Password und Best\u00e4tigung stimmen nicht \u00fcberein.
 usersgroupsroles.users.edit.title=Benutzer*in {0} bearbeiten
@@ -111,24 +111,24 @@ usersgroupsroles.users.disable.confirm.title=Deaktivierung Benutzer*in best\u00e
 usersgroupsroles.users.disable.confirm.cancel=Abbrechen
 usersgroupsroles.users.disable.confirm.message=Sind Sie sicher das Sie den/die Benutzer*in {0} deaktivieren wollen?
 usersgroupsroles.users.disable.confirm.yes=Benutzer*in deaktivieren
-usergroupsroles.users.user_details.email_addresses.remove.confirm.title=Entfernen E-Mail-Adresse best\u00e4tigen
-usergroupsroles.users.user_details.email_addresses.remove.confirm.cancel=Abbrechen
-usergroupsroles.users.user_details.email_addresses.remove.confirm.message=Sind Sie sicher, dass Sie die E-Mail-Adresse {0} entfernen wollen?
-usergroupsroles.users.user_details.email_addresses.remove.confirm.yes=E-Mail-Adresse entfernen
-usergroupsroles.users.user_details.groups.none=Diese(r) Benutzer*in ist nicht Mitglied einer Gruppe
-usergroupsroles.users.user_details.groups.edit=Bearbeiten
-usergroupsroles.users.user_details.roles.edit=Bearbeiten
-usergroupsroles.users.user_details.roles.none=Dieser(m) Benutzer*in sind keine Rollen zugeordnet
-usergroupsroles.users.user_details.email_addresses.none=Diese(r) Benutzer*in hat keine weiteren E-Mail-Adressen
-usergroupsroles.users.user_details.additional_email_addresses.add=E-Mail-Adresse hinzuf\u00fcgen
-usergroupsroles.users.user_details.groups.dialog.title=Gruppenmitgliedschaften bearbeiten
-usergroupsroles.users.user_details.groups.dialog.close=Abbrechen
-usergroupsroles.users.user_details.groups.dialog.save=Anwenden
+usersgroupsroles.users.user_details.email_addresses.remove.confirm.title=Entfernen E-Mail-Adresse best\u00e4tigen
+usersgroupsroles.users.user_details.email_addresses.remove.confirm.cancel=Abbrechen
+usersgroupsroles.users.user_details.email_addresses.remove.confirm.message=Sind Sie sicher, dass Sie die E-Mail-Adresse {0} entfernen wollen?
+usersgroupsroles.users.user_details.email_addresses.remove.confirm.yes=E-Mail-Adresse entfernen
+usersgroupsroles.users.user_details.groups.none=Diese(r) Benutzer*in ist nicht Mitglied einer Gruppe
+usersgroupsroles.users.user_details.groups.edit=Bearbeiten
+usersgroupsroles.users.user_details.roles.edit=Bearbeiten
+usersgroupsroles.users.user_details.roles.none=Dieser(m) Benutzer*in sind keine Rollen zugeordnet
+usersgroupsroles.users.user_details.email_addresses.none=Diese(r) Benutzer*in hat keine weiteren E-Mail-Adressen
+usersgroupsroles.users.user_details.additional_email_addresses.add=E-Mail-Adresse hinzuf\u00fcgen
+usersgroupsroles.users.user_details.groups.dialog.title=Gruppenmitgliedschaften bearbeiten
+usersgroupsroles.users.user_details.groups.dialog.close=Abbrechen
+usersgroupsroles.users.user_details.groups.dialog.save=Anwenden
 usersgroupsroles.users.user_details.roles.dialog.title=Rollenmitgliedschaften bearbeiten
 usersgroupsroles.users.user_details.roles.dialog.close=Abbrechen
 usersgroupsroles.users.user_details.groups.dialog.save=Anwenden
-usergroupsroles.users.user_details.family_name=Familienname
-usergroupsroles.users.user_details.email_addresses.errors.address_empty=Die Addresse kann nicht leer sein
+usersgroupsroles.users.user_details.family_name=Familienname
+usersgroupsroles.users.user_details.email_addresses.errors.address_empty=Die Addresse kann nicht leer sein
 usersgroupsroles.groups.table.headers.groupname=Gruppe
 usersgroupsroles.groups.table.headers.actions=Aktionen
 usersgroupsroles.groups.detailslink.label=Details
@@ -138,3 +138,22 @@ usersgroupsroles.groups.delete.confirm.cancel=Abbrechen
 usersgroupsroles.groups.delete.confirm.yes=Gruppe l\u00f6schen
 usersgroupsroles.groups.delete.confirm.message=Sind Sie sicher, dass Sie die Gruppe {0} l\u00f6schen wollen?
 usersgroupsroles.groups.add=Gruppe hinzuf\u00fcgen
+usersgroupsroles.groups.create.title=Neue Gruppe anlegen
+usersgroupsroles.groups.edit.title=Gruppe {0} bearbeiten
+usersgroupsroles.groups.breadcrumb.new=Neue Gruppe anlegen
+usersgroupsroles.groups.breadcrumb.edit=Gruppe bearbeiten
+usersgroupsroles.groups.form.groupname.label=Name der Gruppe
+usersgroupsroles.groups.form.username.help=Eindeutiger Name der Gruppe
+usersgroupsroles.groups.form.buttons.cancel=Abbrechen
+usersgroupsroles.groups.form.buttons.create=Neue Gruppe anlegen
+usersgroupsroles.groups.form.buttons.save=Speichern
+usersgroupsroles.groups.group_details.title=Details Gruppe {0}
+usersgroupsroles.groups.group_details.id=ID der Gruppe
+usersgroupsroles.groups.group_details.uuid=UUID der Gruppe
+usersgroupsroles.groups.group_details.name=Name der Gruppe
+usersgroupsroles.groups.group_details.edit_group=Gruppe bearbeiten
+usersgroupsroles.groups.group_details.members.heading=Mitglieder
+usersgroupsroles.groups.group_details.members.edit=Mitglieder hinzuf\u00fcgen/entfernen
+usersgroupsroles.groups.group_details.members.dialog.title=Mitglieder hinzuf\u00fcgen/entfernen
+usersgroupsroles.groups.group_details.members.dialog.close=Abbrechen
+usersgroupsroles.groups.group_details.members.dialog.save=Anwenden

From 9bc6659fb2a79f08f9dfb7b6dca0aa7cb9db5344 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 15 Oct 2020 19:58:11 +0200
Subject: [PATCH 21/93] Additional forms and controller methods for groups

---
 .../usersgroupsroles/GroupDetailsModel.java   |  59 ++++++-
 .../usersgroupsroles/GroupFormController.java | 149 ++++++++++++++++++
 .../usersgroupsroles/GroupUserFormEntry.java  |  70 ++++++++
 .../usersgroupsroles/GroupsController.java    | 118 +++++++++++++-
 ...ormEntry.java => PartyRolesFormEntry.java} |   2 +-
 .../usersgroupsroles/UserDetailsModel.java    |   6 +-
 .../usersgroupsroles/UsersController.java     |   4 +-
 .../users-groups-roles/group-details.xhtml    | 108 +++++++++++++
 .../users-groups-roles/group-not-found.xhtml  |  40 +++++
 .../ui/admin/users-groups-roles/groups.xhtml  |   2 +-
 .../users-groups-roles/user-details.xhtml     |   2 +-
 .../org/libreccm/ui/AdminBundle.properties    |   9 ++
 .../org/libreccm/ui/AdminBundle_de.properties |   9 ++
 13 files changed, 565 insertions(+), 13 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java
 rename ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/{UserRolesFormEntry.java => PartyRolesFormEntry.java} (98%)
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java
index 03d60a62a..b2831bb87 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java
@@ -20,7 +20,11 @@ package org.libreccm.ui.admin.usersgroupsroles;
 
 import org.libreccm.security.Group;
 import org.libreccm.security.GroupMembership;
+import org.libreccm.security.Role;
 import org.libreccm.security.RoleMembership;
+import org.libreccm.security.RoleRepository;
+import org.libreccm.security.User;
+import org.libreccm.security.UserRepository;
 import org.libreccm.ui.Message;
 
 import java.util.ArrayList;
@@ -30,6 +34,7 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.inject.Named;
 import javax.transaction.Transactional;
 
@@ -41,6 +46,12 @@ import javax.transaction.Transactional;
 @RequestScoped
 @Named("GroupDetailsModel")
 public class GroupDetailsModel {
+    
+    @Inject
+    private RoleRepository roleRepository;
+    
+    @Inject
+    private UserRepository userRepository;
 
     private long groupId;
 
@@ -85,7 +96,23 @@ public class GroupDetailsModel {
     public List<PartyRoleMembership> getRoles() {
         return Collections.unmodifiableList(roles);
     }
-
+    
+    public List<GroupUserFormEntry> getGroupMemberFormEntries() {
+        return userRepository
+            .findAll()
+            .stream()
+            .map(this::buildGroupUserFormEntry)
+            .collect(Collectors.toList());
+    }
+    
+    public List<PartyRolesFormEntry> getGroupRolesFormEntries() {
+        return roleRepository
+            .findAll()
+            .stream()
+            .map(this::buildGroupRolesFormEntry)
+            .collect(Collectors.toList());
+    }
+        
     @Transactional(Transactional.TxType.REQUIRED)
     protected void setGroup(final Group group) {
         Objects.requireNonNull(group);
@@ -112,5 +139,35 @@ public class GroupDetailsModel {
     public boolean isNewGroup() {
         return groupId == 0;
     }
+    
+    private GroupUserFormEntry buildGroupUserFormEntry(final User user) {
+        final GroupUserFormEntry entry = new GroupUserFormEntry();
+        entry.setUserId(user.getPartyId());
+        entry.setUserName(user.getName());
+        entry.setUserUuid(user.getUuid());
+        entry.setMember(
+            members
+            .stream()
+            .anyMatch(
+                membership -> membership.getUserUuid().equals(user.getUuid())
+            )
+        );
+        return entry;
+    }
+    
+    private PartyRolesFormEntry buildGroupRolesFormEntry(final Role role) {
+        final PartyRolesFormEntry entry = new PartyRolesFormEntry();
+        entry.setRoleId(role.getRoleId());
+        entry.setRoleName(role.getName());
+        entry.setRoleUuid(role.getUuid());
+        entry.setMember(
+            roles
+            .stream()
+            .anyMatch(
+                membership -> membership.getRoleUuid().equals(role.getUuid())
+            )
+        );
+        return entry;
+    }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
new file mode 100644
index 000000000..5318a5c85
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.Group;
+import org.libreccm.security.GroupManager;
+import org.libreccm.security.GroupRepository;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.mvc.MvcContext;
+import javax.mvc.binding.BindingResult;
+import javax.mvc.binding.MvcBinding;
+import javax.transaction.Transactional;
+import javax.validation.constraints.NotBlank;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@Controller
+@Path("/users-groups-roles/groups/")
+@RequestScoped
+public class GroupFormController {
+
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private BindingResult bindingResult;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private Models models;
+
+    @Inject
+    private MvcContext mvc;
+
+    @Inject
+    private GroupManager groupManager;
+
+    @Inject
+    private GroupRepository groupRepository;
+
+    @MvcBinding
+    @FormParam("groupName")
+    @NotBlank
+    private String groupName;
+
+    @POST
+    @Path("/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String createGroup() {
+        if (bindingResult.isFailed()) {
+            models.put("errors", bindingResult.getAllMessages());
+            return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
+        }
+
+        final Group group = new Group();
+        group.setName(groupName);
+        groupRepository.save(group);
+
+        return "redirect:users-groups-roles/groups";
+    }
+
+    @POST
+    @Path("{groupIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateUser(
+        @PathParam("groupIdentifier") final String groupIdentifierParam
+    ) {
+        if (bindingResult.isFailed()) {
+            models.put("errors", bindingResult.getAllMessages());
+            return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
+        }
+
+        final Identifier identifier = identifierParser.parseIdentifier(
+            groupIdentifierParam
+        );
+        final Optional<Group> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = groupRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = groupRepository.findByUuid(identifier.getIdentifier());
+                break;
+            default:
+                result = groupRepository.findByName(identifier.getIdentifier());
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Group group = result.get();
+            group.setName(groupName);
+
+            groupRepository.save(group);
+            return "redirect:users-groups-roles/groups";
+        } else {
+            models.put("errors", Arrays.asList(
+                       adminMessages.getMessage(
+                           "usersgroupsroles.groups.not_found.message",
+                           Arrays.asList(groupIdentifierParam)
+                       )
+                   ));
+            return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
+        }
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java
new file mode 100644
index 000000000..022dad62d
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class GroupUserFormEntry {
+    
+    private long userId;
+    
+    private String userUuid;
+    
+    private String userName;
+    
+    private boolean member;
+
+    public long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(final long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserUuid() {
+        return userUuid;
+    }
+
+    public void setUserUuid(final String userUuid) {
+        this.userUuid = userUuid;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(final String userName) {
+        this.userName = userName;
+    }
+
+    public boolean isMember() {
+        return member;
+    }
+
+    public void setMember(final boolean member) {
+        this.member = member;
+    }
+    
+    
+    
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
index 9c98bf7e1..060853ca4 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
@@ -18,20 +18,29 @@
  */
 package org.libreccm.ui.admin.usersgroupsroles;
 
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.Group;
 import org.libreccm.security.GroupRepository;
 import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.ui.Message;
+import org.libreccm.ui.MessageType;
+import org.libreccm.ui.admin.AdminMessages;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
+import javax.transaction.Transactional;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 
 /**
  *
@@ -41,10 +50,19 @@ import javax.ws.rs.Path;
 @Controller
 @Path("/users-groups-roles/groups")
 public class GroupsController {
-    
+
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private GroupDetailsModel groupDetailsModel;
+
     @Inject
     private GroupRepository groupRepository;
-    
+
+    @Inject
+    private IdentifierParser identifierParser;
+
     @Inject
     private Models models;
 
@@ -55,8 +73,102 @@ public class GroupsController {
     public String getGroups() {
         final List<Group> groups = groupRepository.findAll();
         models.put("groups", groups);
-        
+
         return "org/libreccm/ui/admin/users-groups-roles/groups.xhtml";
     }
 
+    @GET
+    @Path("/{groupIdentifier}/details")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String getGroupDetails(
+        @PathParam("groupIdentifier") final String groupIdentifierParam
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            groupIdentifierParam
+        );
+        final Optional<Group> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = groupRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = groupRepository.findByUuid(identifier.getIdentifier());
+                break;
+            default:
+                result = groupRepository.findByName(identifier.getIdentifier());
+                break;
+        }
+
+        if (result.isPresent()) {
+            groupDetailsModel.setGroup(result.get());
+            return "org/libreccm/ui/admin/users-groups-roles/group-details.xhtml";
+        } else {
+            groupDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.groups.not_found.message",
+                        Arrays.asList(groupIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml";
+        }
+    }
+
+    @GET
+    @Path("/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String newGroup() {
+        return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
+    }
+
+    @GET
+    @Path("/{groupIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String editGroup(
+        @PathParam("groupIdentifier") final String groupIdentifierParam
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            groupIdentifierParam
+        );
+        final Optional<Group> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = groupRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = groupRepository.findByUuid(identifier.getIdentifier());
+                break;
+            default:
+                result = groupRepository.findByName(identifier.getIdentifier());
+                break;
+        }
+
+        if (result.isPresent()) {
+            groupDetailsModel.setGroup(result.get());
+            return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
+        } else {
+            groupDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.groups.not_found.message",
+                        Arrays.asList(groupIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml";
+        }
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserRolesFormEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/PartyRolesFormEntry.java
similarity index 98%
rename from ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserRolesFormEntry.java
rename to ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/PartyRolesFormEntry.java
index 24a623aa3..82b658ef1 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserRolesFormEntry.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/PartyRolesFormEntry.java
@@ -23,7 +23,7 @@ package org.libreccm.ui.admin.usersgroupsroles;
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class UserRolesFormEntry {
+public class PartyRolesFormEntry {
     
     private long roleId;
     
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
index a3a3f2c5c..78d052288 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
@@ -175,7 +175,7 @@ public class UserDetailsModel {
         return Collections.unmodifiableList(roles);
     }
     
-    public List<UserRolesFormEntry> getUserRolesFormEntries() {
+    public List<PartyRolesFormEntry> getUserRolesFormEntries() {
         return roleRepository
             .findAll()
             .stream()
@@ -202,8 +202,8 @@ public class UserDetailsModel {
         return entry;
     }
     
-    private UserRolesFormEntry buildUserRolesFormEntry(final Role role) {
-        final UserRolesFormEntry entry = new UserRolesFormEntry();
+    private PartyRolesFormEntry buildUserRolesFormEntry(final Role role) {
+        final PartyRolesFormEntry entry = new PartyRolesFormEntry();
         entry.setRoleId(role.getRoleId());
         entry.setRoleName(role.getName());
         entry.setRoleUuid(role.getUuid());
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
index 8ff095e33..923db04e4 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java
@@ -142,9 +142,7 @@ public class UsersController {
     @Path("/new")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String newUser(
-        @PathParam("userIdentifier") final String userIdentifier
-    ) {
+    public String newUser() {
         return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
     }
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
index b9e9605f7..64026c3b0 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
@@ -121,7 +121,115 @@
                             </div>
                         </form>
                     </div>
+                </div>
             </div>
+            <c:choose>
+                <c:when test="#{GroupDetailsModel.members.size() > 0}">
+                    <ul class="list-group mt-1">
+                        <c:forEach items="#{GroupDetailsModel.members}" 
+                                   var="member">
+                            <li class="list-group-item">
+                                <a href="#">
+                                    #{member.userName}
+                                </a>
+                            </li>
+                        </c:forEach>
+                    </ul>
+                </c:when>
+                <c:otherwise>
+                    <div class="alert alert-info" role="alert">
+                        #{AdminMessages['usersgroupsroles.groups.group_details.members.none']}
+                    </div>
+                </c:otherwise>
+            </c:choose>
+
+            <div class="d-flex mb-1">
+                <h2 class="mr-2">
+                    #{AdminMessages['usersgroupsroles.groups.groups_details.roles.heading']}
+                </h2>
+                <button class="btn btn-primary" 
+                        data-toggle="modal"
+                        data-target="#group-roles-dialog"
+                        type="button">
+                    <svg class="bi"
+                         width="1em"
+                         height="1em"
+                         fill="currentColor">
+                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                    </svg>
+                    <span>#{AdminMessages['usersgroupsroles.groups.group_details.roles.edit']}</span>
+                </button>
+                <div aria-labelledby="group-roles-dialog-title"
+                     aria-hidden="true"
+                     class="modal fade"
+                     data-backdrop="static"
+                     id="user-roles-dialog"
+                     tabindex="-1">
+                    <div class="modal-dialog">
+                        <form action="#{mvc.uri('UserFormController#updateRoleMemberships', {'userIdentifier': UserDetailsModel.name })}"
+                              class="modal-content"
+                              method="post">
+                            <div class="modal-header">
+                                <h3 class="modal-title"
+                                    id="group-roles-dialog.title">
+                                    #{AdminMessages['usersgroupsroles.groups.group_details.roles.dialog.title']}
+                                </h3>
+                                <button aria-label="#{AdminMessages['usersgroupsroles.groups.group_details.roles.dialog.close']}"
+                                        class="close"
+                                        data-dismiss="modal"
+                                        type="button">
+                                    <span aria-hidden="true">&times;</span>
+                                </button>
+                            </div>
+                            <div class="modal-body">
+                                <c:forEach items="#{GroupDetailsModel.groupRolesFormEntries}" 
+                                           var="entry">
+                                    <div class="form-check form-check-inline">
+                                        <input class="form-check-input"
+                                               checked="#{entry.member ? 'checked' : ''}"
+                                               id="role-#{entry.roleName}"
+                                               name="userRoles[]"
+                                               value="#{entry.roleName}"
+                                               type="checkbox" />
+                                        <label for="role#{entry.roleName}">
+                                            #{entry.roleName}
+                                        </label>
+                                    </div>
+                                </c:forEach>
+                            </div>
+                            <div class="modal-footer">
+                                <button class="btn btn-secondary" 
+                                        data-dismiss="modal"
+                                        type="button" >
+                                    #{AdminMessages['usersgroupsroles.groups.group_details.roles.dialog.close']}
+                                </button>
+                                <button type="submit" class="btn btn-primary">
+                                    #{AdminMessages['usersgroupsroles.groups.group_details.roles.dialog.save']}
+                                </button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+
+            <c:choose>
+                <c:when test="#{GroupDetailsModel.roles.size() > 0}">
+                    <ul class="list-group mt-1 mb-4">
+                        <c:forEach items="#{GroupDetailsModel.roles}" 
+                                   var="role">
+                            <a href="#">
+                                #{role.roleName}
+                            </a>
+                        </c:forEach>
+                    </ul>
+                </c:when>
+                <c:otherwise>
+                    <div class="alert alert-info" role="alert">
+                        #{AdminMessages['usersgroupsroles.groups.group_details.roles.none']}
+                    </div>
+                </c:otherwise>
+            </c:choose>
+
         </ui:define>
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml
new file mode 100644
index 000000000..89a5ed0cc
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="groups" />
+        <ui:param name="title"
+                  value="#{AdminMessages('usersgroupsroles.groups.not_found.title')}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersController#getUsers')}">
+                    #{AdminMessages['usersgroupsroles.users.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                #{AdminMessages['usersgroupsroles.users.not_found.title']}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <c:forEach items="#{UserDetailsModel.messages}" var="message">
+                <div class="alert alert-#{message.messageType}" role="alert">
+                    #{message}
+                </div>
+            </c:forEach>
+        </ui:define>
+
+    </ui:composition>
+
+
+</html>
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
index 7e73a4427..ba4fccce4 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
@@ -28,7 +28,7 @@
                 </div>
                 <div class="col-sm-3 text-right">
                     <a class="btn btn-secondary" 
-                       href="#">
+                       href="#{mvc.uri("GroupsController#newGroup")}">
                         <svg class="bi"
                              width="1em"
                              height="1em"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
index 68bcf5610..0deb59632 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -422,7 +422,7 @@
                                     #{AdminMessages['usersgroupsroles.users.user_details.roles.dialog.close']}
                                 </button>
                                 <button type="submit" class="btn btn-primary">
-                                    #{AdminMessages['usersgroupsroles.users.user_details.groups.dialog.save']}
+                                    #{AdminMessages['usersgroupsroles.users.user_details.roles.dialog.save']}
                                 </button>
                             </div>
                         </form>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 01f32ea41..92ae688b6 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -157,3 +157,12 @@ usersgroupsroles.groups.group_details.members.edit=Add/remove members
 usersgroupsroles.groups.group_details.members.dialog.title=Add/remove members
 usersgroupsroles.groups.group_details.members.dialog.close=Cancel
 usersgroupsroles.groups.group_details.members.dialog.save=Apply
+usersgroupsroles.groups.group_details.members.none=This group has no members
+usersgroupsroles.groups.groups_details.roles.heading=Roles
+usersgroupsroles.groups.group_details.roles.edit=Edit
+usersgroupsroles.groups.group_details.roles.dialog.title=Edit role memberships
+usersgroupsroles.groups.group_details.roles.dialog.close=Cancel
+usersgroupsroles.users.user_details.roles.dialog.save=Apply
+usersgroupsroles.groups.group_details.roles.dialog.save=Apply
+usersgroupsroles.groups.group_details.roles.none=No roles assigned to this group
+usersgroupsroles.groups.not_found.title=Group not found
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index f424bf9a3..457ea7df3 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -157,3 +157,12 @@ usersgroupsroles.groups.group_details.members.edit=Mitglieder hinzuf\u00fcgen/en
 usersgroupsroles.groups.group_details.members.dialog.title=Mitglieder hinzuf\u00fcgen/entfernen
 usersgroupsroles.groups.group_details.members.dialog.close=Abbrechen
 usersgroupsroles.groups.group_details.members.dialog.save=Anwenden
+usersgroupsroles.groups.group_details.members.none=Diese Gruppe hat keine Mitglieder
+usersgroupsroles.groups.groups_details.roles.heading=Rollen
+usersgroupsroles.groups.group_details.roles.edit=Bearbeiten
+usersgroupsroles.groups.group_details.roles.dialog.title=Rollenmitgliedschaften bearbeiten
+usersgroupsroles.groups.group_details.roles.dialog.close=Abbrechen
+usersgroupsroles.users.user_details.roles.dialog.save=Anwenden
+usersgroupsroles.groups.group_details.roles.dialog.save=Anwenden
+usersgroupsroles.groups.group_details.roles.none=Dieser Gruppe sind keine Rollen zugeordnet
+usersgroupsroles.groups.not_found.title=Gruppe nicht gefunden

From a6b7c7e9004ba2358306f1554f169a133b8707bc Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 20 Oct 2020 20:21:28 +0200
Subject: [PATCH 22/93] Groups management UI

---
 .../usersgroupsroles/GroupFormController.java | 41 +++++++++++++++++++
 .../usersgroupsroles/UserFormController.java  | 15 +++----
 .../UsersGroupsRolesPage.java                 |  1 +
 .../users-groups-roles/group-details.xhtml    | 28 ++++++-------
 .../admin/users-groups-roles/group-form.xhtml | 12 +++---
 .../ui/admin/users-groups-roles/groups.xhtml  |  4 +-
 .../users-groups-roles/user-details.xhtml     |  2 +-
 .../org/libreccm/ui/AdminBundle.properties    |  3 ++
 .../org/libreccm/ui/AdminBundle_de.properties |  3 ++
 9 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
index 5318a5c85..82bcb4c3c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
@@ -29,6 +29,8 @@ import org.libreccm.security.RequiresPrivilege;
 import org.libreccm.ui.admin.AdminMessages;
 
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
@@ -146,4 +148,43 @@ public class GroupFormController {
         }
     }
 
+    @POST
+    @Path("{groupIdentifier}/groups")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateGroupMemberships(
+        @PathParam("groupIdentifier") final String groupIdentifierParam,
+        @FormParam("groupMembers") final String[] groupMembers
+    ) {
+        final Map<String, Object> params = new HashMap<>();
+        params.put("groupIdentifier", groupIdentifierParam);
+        return String.format(
+            "redirect:",
+            mvc.uri(
+                "GroupsController#getGroupDetails",
+                params
+            )
+        );
+    }
+
+    @POST
+    @Path("{groupIdentifier}/roles")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateRoleMemberships(
+        @PathParam("groupIdentifier") final String groupIdentifierParam,
+        @FormParam("groupRoles") final String[] groupRoles
+    ) {
+        // ToDo
+        return String.format(
+            "redirect:%s", 
+            mvc.uri(
+                "UsersController#getUserDetails", 
+                Map.of("userIdentifier", groupIdentifierParam)
+            )
+        );
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
index 41b9a2fdc..3627235da 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
@@ -29,6 +29,7 @@ import org.libreccm.security.UserRepository;
 import org.libreccm.ui.admin.AdminMessages;
 
 import java.util.Arrays;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -221,11 +222,8 @@ public class UserFormController {
         return String.format(
             "redirect:%s", 
             mvc.uri(
-                String.format(
-                    "UsersController#getUserDetails", 
-                    "{userIdentifier: %s}", 
-                    userIdentifierParam
-                )
+                "UsersController#getUserDetails", 
+                Map.of("userIdentifier", userIdentifierParam)
             )
         );
     }
@@ -243,11 +241,8 @@ public class UserFormController {
         return String.format(
             "redirect:%s", 
             mvc.uri(
-                String.format(
-                    "UsersController#getUserDetails", 
-                    "{userIdentifier: %s}", 
-                    userIdentifierParam
-                )
+                "UsersController#getUserDetails", 
+                Map.of("userIdentifier", userIdentifierParam)
             )
         );
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
index 7585eac63..812f9b4cb 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
@@ -38,6 +38,7 @@ public class UsersGroupsRolesPage implements AdminPage {
         final Set<Class<?>> classes = new HashSet<>();
         classes.add(UsersGroupsRolesController.class);
         classes.add(GroupsController.class);
+        classes.add(GroupFormController.class);
         classes.add(RolesController.class);
         classes.add(UsersController.class);
         classes.add(UserFormController.class);
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
index 64026c3b0..a2c489c5b 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
@@ -6,9 +6,9 @@
       xmlns:xlink="http://www.w3.org/1999/xlink">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
-        <ui:param name="activePanel" value="users" />
+        <ui:param name="activePanel" value="groups" />
         <ui:param name="title"
-                  value="#{AdminMessages.getMessage('usersgroupsroles.groups.group_details.title', [GroupDetailsModel.name])}" />
+                  value="#{AdminMessages.getMessage('usersgroupsroles.groups.group_details.title', [GroupDetailsModel.groupName])}" />
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
@@ -17,19 +17,19 @@
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersController#getGroups')}">
+                <a href="#{mvc.uri('GroupsController#getGroups')}">
                     #{AdminMessages['usersgroupsroles.groups.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                #{GroupDetailsModel.name}
+                #{GroupDetailsModel.groupName}
             </li>
         </ui:define>
 
         <ui:define name="panel">
             <dl>
                 <div>
-                    <dt>#{AdminMessages['usersgroupsroles.groups.group_details.id']}</dt>
+                    <dt>#{AdminMessages['usersgroupsroles.groups.group_details.groupId']}</dt>
                     <dd>#{GroupDetailsModel.groupId}</dd>
                 </div>
                 <div>
@@ -37,12 +37,12 @@
                     <dd>#{GroupDetailsModel.uuid}</dd>
                 </div>
                 <div>
-                    <dt>#{AdminMessages['usersgroupsroles.groups.group_details.name']}</dt>
-                    <dd>#{GroupDetailsModel.name}</dd>
+                    <dt>#{AdminMessages['usersgroupsroles.groups.group_details.groupName']}</dt>
+                    <dd>#{GroupDetailsModel.groupName}</dd>
                 </div>
             </dl>
             <a class="btn btn-primary" 
-               href="#{mvc.uri('GroupsController#editGroup', {'groupIdentifier': GroupDetailsModel.name })}">
+               href="#{mvc.uri('GroupsController#editGroup', {'groupIdentifier': GroupDetailsModel.groupName })}">
                 <svg class="bi"
                      width="1em"
                      height="1em"
@@ -54,7 +54,7 @@
                 </span>
             </a>
 
-            <div class="d-flex mb-1">
+            <div class="d-flex mt-3 mb-1">
                 <h2 class="mr-2">
                     #{AdminMessages['usersgroupsroles.groups.group_details.members.heading']}
                 </h2>
@@ -77,7 +77,7 @@
                      id="group-members-dialog" 
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="#{mvc.uri('GroupFormController#updateGroupMemberships', {'groupIdentifier': GroupDetailsModel.name})}" 
+                        <form action="#{mvc.uri('GroupFormController#updateGroupMemberships', {'groupIdentifier': GroupDetailsModel.groupName})}" 
                               class="modal-content" 
                               method="post">
                             <div class="modal-header">
@@ -163,15 +163,15 @@
                      aria-hidden="true"
                      class="modal fade"
                      data-backdrop="static"
-                     id="user-roles-dialog"
+                     id="group-roles-dialog"
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="#{mvc.uri('UserFormController#updateRoleMemberships', {'userIdentifier': UserDetailsModel.name })}"
+                        <form action="#{mvc.uri('GroupFormController#updateRoleMemberships', {'groupIdentifier': GroupDetailsModel.groupName })}"
                               class="modal-content"
                               method="post">
                             <div class="modal-header">
                                 <h3 class="modal-title"
-                                    id="group-roles-dialog.title">
+                                    id="group-roles-dialog-title">
                                     #{AdminMessages['usersgroupsroles.groups.group_details.roles.dialog.title']}
                                 </h3>
                                 <button aria-label="#{AdminMessages['usersgroupsroles.groups.group_details.roles.dialog.close']}"
@@ -188,7 +188,7 @@
                                         <input class="form-check-input"
                                                checked="#{entry.member ? 'checked' : ''}"
                                                id="role-#{entry.roleName}"
-                                               name="userRoles[]"
+                                               name="groupRoles[]"
                                                value="#{entry.roleName}"
                                                type="checkbox" />
                                         <label for="role#{entry.roleName}">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
index 0e08a2cc2..3c7ed9b55 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
@@ -7,7 +7,7 @@
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="users" />
         <ui:param name="title"
-                  value="#{GroupDetailsModel.newGroup ? AdminMessages['usersgroupsroles.groups.create.title'] : AdminMessages.getMessage('usersgroupsroles.groups.edit.title', [GroupDetailsModel.name]) }" />
+                  value="#{GroupDetailsModel.newGroup ? AdminMessages['usersgroupsroles.groups.create.title'] : AdminMessages.getMessage('usersgroupsroles.groups.edit.title', [GroupDetailsModel.groupName]) }" />
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
@@ -16,13 +16,13 @@
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('GroupsController#getGroup')}">
+                <a href="#{mvc.uri('GroupsController#getGroups')}">
                     #{AdminMessages['usersgroupsroles.groups.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
                 <a href="#{mvn.uri('GroupsController#getGroupDetails', { 'groupIdentfier': group.name })}">
-                    #{UserDetailsModel.name}
+                    #{GroupDetailsModel.groupName}
                 </a>
             </li>
             <li>
@@ -48,7 +48,7 @@
                            class="form-control" 
                            id="groupname" 
                            name="groupName" 
-                           value="#{GroupDetailsModel.name}"
+                           value="#{GroupDetailsModel.groupName}"
                            type="text" />
                     <small class="form-text text-muted"
                            id="groupname-help">
@@ -56,12 +56,12 @@
                     </small>
                 </div>
                 <a class="btn btn-warning" 
-                   href="#{mvc.uri('UsersController#getGroups')}">
+                   href="#{mvc.uri('GroupsController#getGroups')}">
                     #{AdminMessages['usersgroupsroles.groups.form.buttons.cancel']}
                 </a>
                 <button class="btn btn-success" type="submit">
                     <c:choose>
-                        <c:when test="#{UserDetailsModel.newGroup}">
+                        <c:when test="#{GroupDetailsModel.newGroup}">
                             #{AdminMessages['usersgroupsroles.groups.form.buttons.create']}
                         </c:when>
                         <c:otherwise>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
index ba4fccce4..75688c26c 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
@@ -28,7 +28,7 @@
                 </div>
                 <div class="col-sm-3 text-right">
                     <a class="btn btn-secondary" 
-                       href="#{mvc.uri("GroupsController#newGroup")}">
+                       href="#{mvc.uri('GroupsController#newGroup')}">
                         <svg class="bi"
                              width="1em"
                              height="1em"
@@ -52,7 +52,7 @@
                                 <td>#{group.name}</td>
                                 <td class="text-center action-col">
                                     <a class="btn btn-info"
-                                       href="#">
+                                       href="#{mvc.uri('GroupsController#getGroupDetails', { 'groupIdentifier': group.name })}">
                                         <svg class="bi"
                                              width="1em"
                                              height="1em"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
index 0deb59632..eb974816d 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -131,7 +131,7 @@
                 </span>
             </a>
 
-            <div class="d-flex">
+            <div class="d-flex mt-3">
                 <h2 class="mr-2">
                     #{AdminMessages['usersgroupsroles.users.user_details.additional_email_addresses.heading']}
                 </h2>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 92ae688b6..f67098b9c 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -166,3 +166,6 @@ usersgroupsroles.users.user_details.roles.dialog.save=Apply
 usersgroupsroles.groups.group_details.roles.dialog.save=Apply
 usersgroupsroles.groups.group_details.roles.none=No roles assigned to this group
 usersgroupsroles.groups.not_found.title=Group not found
+usersgroupsroles.groups.group_details.groupId=Group ID
+usersgroupsroles.groups.group_details.groupName=Group Name
+usersgroupsroles.users.user_details.additional_email_addresses.cols.address=Address
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 457ea7df3..9590552db 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -166,3 +166,6 @@ usersgroupsroles.users.user_details.roles.dialog.save=Anwenden
 usersgroupsroles.groups.group_details.roles.dialog.save=Anwenden
 usersgroupsroles.groups.group_details.roles.none=Dieser Gruppe sind keine Rollen zugeordnet
 usersgroupsroles.groups.not_found.title=Gruppe nicht gefunden
+usersgroupsroles.groups.group_details.groupId=ID der Gruppe
+usersgroupsroles.groups.group_details.groupName=Name der Gruppe
+usersgroupsroles.users.user_details.additional_email_addresses.cols.address=Adresse

From f83d4b4833cdd19fcb6cdfd56976cc74abe3d799 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 21 Oct 2020 20:11:22 +0200
Subject: [PATCH 23/93] User and groups management implementaiton completed

---
 .../usersgroupsroles/GroupFormController.java |  65 +---
 .../GroupMembersRolesController.java          | 286 ++++++++++++++++++
 .../usersgroupsroles/RolesController.java     |  13 +
 .../usersgroupsroles/UserFormController.java  |  42 +--
 .../UserGroupsRolesController.java            | 285 +++++++++++++++++
 .../UsersGroupsRolesPage.java                 |   2 +
 .../users-groups-roles/group-details.xhtml    |  16 +-
 .../users-groups-roles/user-details.xhtml     |  17 +-
 .../org/libreccm/ui/AdminBundle_de.properties |   2 +-
 9 files changed, 620 insertions(+), 108 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsRolesController.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
index 82bcb4c3c..18e11c4ab 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
@@ -26,12 +26,16 @@ import org.libreccm.security.Group;
 import org.libreccm.security.GroupManager;
 import org.libreccm.security.GroupRepository;
 import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.User;
+import org.libreccm.security.UserRepository;
 import org.libreccm.ui.admin.AdminMessages;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
@@ -68,12 +72,6 @@ public class GroupFormController {
     @Inject
     private Models models;
 
-    @Inject
-    private MvcContext mvc;
-
-    @Inject
-    private GroupManager groupManager;
-
     @Inject
     private GroupRepository groupRepository;
 
@@ -105,7 +103,7 @@ public class GroupFormController {
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
-    public String updateUser(
+    public String updateGroup(
         @PathParam("groupIdentifier") final String groupIdentifierParam
     ) {
         if (bindingResult.isFailed()) {
@@ -138,53 +136,16 @@ public class GroupFormController {
             groupRepository.save(group);
             return "redirect:users-groups-roles/groups";
         } else {
-            models.put("errors", Arrays.asList(
-                       adminMessages.getMessage(
-                           "usersgroupsroles.groups.not_found.message",
-                           Arrays.asList(groupIdentifierParam)
-                       )
-                   ));
+            models.put(
+                "errors", Arrays.asList(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.groups.not_found.message",
+                        Arrays.asList(groupIdentifierParam)
+                    )
+                )
+            );
             return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
         }
     }
 
-    @POST
-    @Path("{groupIdentifier}/groups")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    @Transactional(Transactional.TxType.REQUIRED)
-    public String updateGroupMemberships(
-        @PathParam("groupIdentifier") final String groupIdentifierParam,
-        @FormParam("groupMembers") final String[] groupMembers
-    ) {
-        final Map<String, Object> params = new HashMap<>();
-        params.put("groupIdentifier", groupIdentifierParam);
-        return String.format(
-            "redirect:",
-            mvc.uri(
-                "GroupsController#getGroupDetails",
-                params
-            )
-        );
-    }
-
-    @POST
-    @Path("{groupIdentifier}/roles")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    @Transactional(Transactional.TxType.REQUIRED)
-    public String updateRoleMemberships(
-        @PathParam("groupIdentifier") final String groupIdentifierParam,
-        @FormParam("groupRoles") final String[] groupRoles
-    ) {
-        // ToDo
-        return String.format(
-            "redirect:%s", 
-            mvc.uri(
-                "UsersController#getUserDetails", 
-                Map.of("userIdentifier", groupIdentifierParam)
-            )
-        );
-    }
-
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java
new file mode 100644
index 000000000..1c70363de
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.Group;
+import org.libreccm.security.GroupManager;
+import org.libreccm.security.GroupRepository;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.Role;
+import org.libreccm.security.RoleManager;
+import org.libreccm.security.RoleRepository;
+import org.libreccm.security.User;
+import org.libreccm.security.UserRepository;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@Controller
+@Path("/users-groups-roles/groups/")
+@RequestScoped
+public class GroupMembersRolesController {
+
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private GroupManager groupManager;
+
+    @Inject
+    private GroupRepository groupRepository;
+
+    @Inject
+    private Models models;
+
+    @Inject
+    private RoleManager roleManager;
+
+    @Inject
+    private RoleRepository roleRepository;
+
+    @Inject
+    private UserRepository userRepository;
+
+    @POST
+    @Path("{groupIdentifier}/groups")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateGroupMemberships(
+        @PathParam("groupIdentifier") final String groupIdentifierParam,
+        @FormParam("groupMembers") final String[] groupMembersParam
+    ) {
+        final Identifier groupIdentifier = identifierParser.parseIdentifier(
+            groupIdentifierParam
+        );
+        final Optional<Group> result;
+        switch (groupIdentifier.getType()) {
+            case ID:
+                result = groupRepository.findById(
+                    Long.parseLong(groupIdentifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = groupRepository.findByUuid(
+                    groupIdentifier.getIdentifier()
+                );
+                break;
+            default:
+                result = groupRepository.findByName(
+                    groupIdentifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Group group = result.get();
+            final List<String> memberNames = Arrays.asList(groupMembersParam);
+
+            // Check for new members
+            final List<String> newMemberNames = memberNames
+                .stream()
+                .filter(memberName -> !hasMember(group, memberName))
+                .collect(Collectors.toList());
+
+            // Check for removed members
+            final List<String> removedMemberNames = group
+                .getMemberships()
+                .stream()
+                .map(membership -> membership.getMember().getName())
+                .filter(memberName -> !memberNames.contains(memberName))
+                .collect(Collectors.toList());
+
+            for (final String newMemberName : newMemberNames) {
+                addNewMember(group, newMemberName);
+            }
+
+            for (final String removedMemberName : removedMemberNames) {
+                removeMember(group, removedMemberName);
+            }
+
+            return String.format(
+                "redirect:/users-groups-roles/groups/%s/details",
+                groupIdentifierParam
+            );
+        } else {
+            models.put(
+                "errors", Arrays.asList(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.groups.not_found.message",
+                        Arrays.asList(groupIdentifierParam)
+                    )
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml";
+        }
+    }
+
+    @POST
+    @Path("{groupIdentifier}/roles")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateRoleMemberships(
+        @PathParam("groupIdentifier") final String groupIdentifierParam,
+        @FormParam("groupRoles") final String[] groupRoles
+    ) {
+        final Identifier groupIdentifier = identifierParser.parseIdentifier(
+            groupIdentifierParam
+        );
+        final Optional<Group> result;
+        switch (groupIdentifier.getType()) {
+            case ID:
+                result = groupRepository.findById(
+                    Long.parseLong(groupIdentifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = groupRepository.findByUuid(
+                    groupIdentifier.getIdentifier()
+                );
+                break;
+            default:
+                result = groupRepository.findByName(
+                    groupIdentifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Group group = result.get();
+            final List<String> roleNames = Arrays.asList(groupRoles);
+
+            // Check for new roles
+            final List<String> newRoleNames = roleNames
+                .stream()
+                .filter(roleName -> !hasRole(group, roleName))
+                .collect(Collectors.toList());
+
+            // Check for removed roles
+            final List<String> removedRoleNames = group
+                .getRoleMemberships()
+                .stream()
+                .map(membership -> membership.getRole().getName())
+                .filter(roleName -> !roleNames.contains(roleName))
+                .collect(Collectors.toList());
+
+            for (final String newRoleName : newRoleNames) {
+                addNewRole(group, newRoleName);
+            }
+
+            for (final String removedRoleName : removedRoleNames) {
+                removeRole(group, removedRoleName);
+            }
+
+            return String.format(
+                "redirect:/users-groups-roles/groups/%s/details",
+                groupIdentifierParam
+            );
+        } else {
+            models.put(
+                "errors", Arrays.asList(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.groups.not_found.message",
+                        Arrays.asList(groupIdentifierParam)
+                    )
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml";
+        }
+    }
+
+    private boolean hasMember(final Group group, final String memberName) {
+        return group
+            .getMemberships()
+            .stream()
+            .map(membership -> membership.getMember().getName())
+            .anyMatch(name -> name.equals(memberName));
+    }
+
+    private void addNewMember(final Group group, final String newMemberName) {
+        final Optional<User> result = userRepository.findByName(newMemberName);
+        if (result.isPresent()) {
+            final User user = result.get();
+            groupManager.addMemberToGroup(user, group);
+        }
+    }
+
+    private void removeMember(
+        final Group group, final String removedMemberName
+    ) {
+        final Optional<User> result = userRepository.findByName(
+            removedMemberName
+        );
+        if (result.isPresent()) {
+            final User user = result.get();
+            groupManager.removeMemberFromGroup(user, group);
+        }
+    }
+
+    private boolean hasRole(final Group group, final String roleName) {
+        return group
+            .getRoleMemberships()
+            .stream()
+            .map(membership -> membership.getMember().getName())
+            .anyMatch(name -> name.equals(roleName));
+    }
+
+    private void addNewRole(final Group group, final String newRoleName) {
+        final Optional<Role> result = roleRepository.findByName(newRoleName);
+        if (result.isPresent()) {
+            final Role role = result.get();
+            roleManager.assignRoleToParty(role, group);
+        }
+    }
+
+    private void removeRole(final Group group, final String removedRoleName) {
+        final Optional<Role> result = roleRepository.findByName(
+            removedRoleName
+        );
+        if (result.isPresent()) {
+            final Role role = result.get();
+            roleManager.removeRoleFromParty(role, group);
+        }
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
index 2154649eb..d694dd0b7 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
@@ -24,8 +24,10 @@ import org.libreccm.security.RequiresPrivilege;
 
 import javax.enterprise.context.RequestScoped;
 import javax.mvc.Controller;
+import javax.transaction.Transactional;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 
 /**
  *
@@ -44,4 +46,15 @@ public class RolesController {
         return "org/libreccm/ui/admin/users-groups-roles/roles.xhtml";
     }
 
+    @GET
+    @Path("/{roleIdentifier}/details")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String getRoleDetails(
+        @PathParam("roleIdentifier") final String roleIdentifierParam
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
index 3627235da..ee0b9688a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
@@ -50,7 +50,7 @@ import javax.ws.rs.PathParam;
 
 /**
  * Controller managing the user post requests from the user edit form.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Controller
@@ -69,7 +69,7 @@ public class UserFormController {
 
     @Inject
     private Models models;
-    
+
     @Inject
     private MvcContext mvc;
 
@@ -208,43 +208,5 @@ public class UserFormController {
             return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
         }
     }
-    
-    @POST
-    @Path("{userIdentifier}/groups")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    @Transactional(Transactional.TxType.REQUIRED)
-    public String updateGroupMemberships(
-        @PathParam("userIdentifier") final String userIdentifierParam,
-        @FormParam("userGroups") final String[] userGroups
-    ) {
-        // ToDo
-        return String.format(
-            "redirect:%s", 
-            mvc.uri(
-                "UsersController#getUserDetails", 
-                Map.of("userIdentifier", userIdentifierParam)
-            )
-        );
-    }
-    
-    @POST
-    @Path("{userIdentifier}/roles")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    @Transactional(Transactional.TxType.REQUIRED)
-    public String updateRoleMemberships(
-        @PathParam("userIdentifier") final String userIdentifierParam,
-        @FormParam("userRoles") final String[] userRoles
-    ) {
-        // ToDo
-        return String.format(
-            "redirect:%s", 
-            mvc.uri(
-                "UsersController#getUserDetails", 
-                Map.of("userIdentifier", userIdentifierParam)
-            )
-        );
-    }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsRolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsRolesController.java
new file mode 100644
index 000000000..9afa33c92
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsRolesController.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.Group;
+import org.libreccm.security.GroupManager;
+import org.libreccm.security.GroupRepository;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.Role;
+import org.libreccm.security.RoleManager;
+import org.libreccm.security.RoleRepository;
+import org.libreccm.security.User;
+import org.libreccm.security.UserRepository;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@Controller
+@Path("/users-groups-roles/users/")
+@RequestScoped
+public class UserGroupsRolesController {
+
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private GroupManager groupManager;
+
+    @Inject
+    private GroupRepository groupRepository;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private Models models;
+
+    @Inject
+    private RoleManager roleManager;
+
+    @Inject
+    private RoleRepository roleRepository;
+
+    @Inject
+    private UserRepository userRepository;
+
+    @POST
+    @Path("{userIdentifier}/groups")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateGroupMemberships(
+        @PathParam("userIdentifier") final String userIdentifierParam,
+        @FormParam("userGroups") final String[] userGroups
+    ) {
+        final Identifier userIdentifier = identifierParser.parseIdentifier(
+            userIdentifierParam
+        );
+        final Optional<User> result;
+        switch (userIdentifier.getType()) {
+            case ID:
+                result = userRepository.findById(
+                    Long.parseLong(userIdentifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = userRepository.findByUuid(
+                    userIdentifier.getIdentifier()
+                );
+                break;
+            default:
+                result = userRepository.findByName(
+                    userIdentifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final User user = result.get();
+            final List<String> groupNames = Arrays.asList(userGroups);
+
+            // Check for new groups
+            final List<String> newGroupNames = groupNames
+                .stream()
+                .filter(groupName -> !isMember(user, groupName))
+                .collect(Collectors.toList());
+
+            // Check for removed groups
+            final List<String> removedGroupNames = user
+                .getGroupMemberships()
+                .stream()
+                .map(membership -> membership.getGroup().getName())
+                .filter(groupName -> !groupNames.contains(groupName))
+                .collect(Collectors.toList());
+
+            for (final String newGroupName : newGroupNames) {
+                addNewGroup(user, newGroupName);
+            }
+
+            for (final String removedGroupName : removedGroupNames) {
+                removeGroup(user, removedGroupName);
+            }
+
+            return String.format(
+                "redirect:/users-groups-roles/users/%s/details",
+                userIdentifierParam
+            );
+        } else {
+            models.put(
+                "errors", Arrays.asList(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.users.not_found.message",
+                        Arrays.asList(userIdentifierParam)
+                    )
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+        }
+    }
+
+    @POST
+    @Path("{userIdentifier}/roles")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateRoleMemberships(
+        @PathParam("userIdentifier") final String userIdentifierParam,
+        @FormParam("userRoles") final String[] userRoles
+    ) {
+        final Identifier userIdentifier = identifierParser.parseIdentifier(
+            userIdentifierParam
+        );
+        final Optional<User> result;
+        switch (userIdentifier.getType()) {
+            case ID:
+                result = userRepository.findById(
+                    Long.parseLong(userIdentifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = userRepository.findByUuid(
+                    userIdentifier.getIdentifier()
+                );
+                break;
+            default:
+                result = userRepository.findByName(
+                    userIdentifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final User user = result.get();
+            final List<String> roleNames = Arrays.asList(userRoles);
+
+            // Check for new roles
+            final List<String> newRoleNames = roleNames
+                .stream()
+                .filter(roleName -> !hasRole(user, roleName))
+                .collect(Collectors.toList());
+
+            // Check for removed roles
+            final List<String> removedRoleNames = user
+                .getRoleMemberships()
+                .stream()
+                .map(membership -> membership.getRole().getName())
+                .filter(roleName -> !roleNames.contains(roleName))
+                .collect(Collectors.toList());
+
+            for (final String newRoleName : newRoleNames) {
+                addNewRole(user, newRoleName);
+            }
+
+            for (final String removedRoleName : removedRoleNames) {
+                removeRole(user, removedRoleName);
+            }
+
+            return String.format(
+                "redirect:/users-groups-roles/users/%s/details",
+                userIdentifierParam
+            );
+        } else {
+            models.put(
+                "errors", Arrays.asList(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.users.not_found.message",
+                        Arrays.asList(userIdentifierParam)
+                    )
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
+        }
+    }
+
+    private boolean isMember(final User user, final String groupName) {
+        return user
+            .getGroupMemberships()
+            .stream()
+            .map(membership -> membership.getGroup().getName())
+            .anyMatch(name -> name.equals(groupName));
+    }
+
+    private void addNewGroup(final User user, final String newGroupName) {
+        final Optional<Group> result = groupRepository.findByName(newGroupName);
+        if (result.isPresent()) {
+            final Group group = result.get();
+            groupManager.addMemberToGroup(user, group);
+        }
+    }
+
+    private void removeGroup(final User user, final String removedGroupName) {
+        final Optional<Group> result = groupRepository.findByName(
+            removedGroupName
+        );
+        if (result.isPresent()) {
+            final Group group = result.get();
+            groupManager.removeMemberFromGroup(user, group);
+        }
+    }
+
+    private boolean hasRole(final User user, final String roleName) {
+        return user
+            .getRoleMemberships()
+            .stream()
+            .map(membership -> membership.getMember().getName())
+            .anyMatch(name -> name.equals(roleName));
+    }
+
+    private void addNewRole(final User user, final String newRoleName) {
+        final Optional<Role> result = roleRepository.findByName(newRoleName);
+        if (result.isPresent()) {
+            final Role role = result.get();
+            roleManager.assignRoleToParty(role, user);
+        }
+    }
+
+    private void removeRole(final User user, final String removedRoleName) {
+        final Optional<Role> result = roleRepository.findByName(
+            removedRoleName
+        );
+        if (result.isPresent()) {
+            final Role role = result.get();
+            roleManager.removeRoleFromParty(role, user);
+        }
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
index 812f9b4cb..ec9db6a98 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
@@ -39,9 +39,11 @@ public class UsersGroupsRolesPage implements AdminPage {
         classes.add(UsersGroupsRolesController.class);
         classes.add(GroupsController.class);
         classes.add(GroupFormController.class);
+        classes.add(GroupMembersRolesController.class);
         classes.add(RolesController.class);
         classes.add(UsersController.class);
         classes.add(UserFormController.class);
+        classes.add(UserGroupsRolesController.class);
         classes.add(EmailFormController.class);
         return classes;
     }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
index a2c489c5b..232969eea 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-details.xhtml
@@ -77,7 +77,7 @@
                      id="group-members-dialog" 
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="#{mvc.uri('GroupFormController#updateGroupMemberships', {'groupIdentifier': GroupDetailsModel.groupName})}" 
+                        <form action="#{mvc.uri('GroupMembersRolesController#updateGroupMemberships', {'groupIdentifier': GroupDetailsModel.groupName})}" 
                               class="modal-content" 
                               method="post">
                             <div class="modal-header">
@@ -99,7 +99,7 @@
                                         <input class="form-check-input"
                                                checked="#{entry.member ? 'checked' : ''}"
                                                id="group-#{entry.userName}" 
-                                               name="groupMembers[]"
+                                               name="groupMembers"
                                                value="#{entry.userName}"
                                                type="checkbox" />
                                         <label class="form-check-label"
@@ -129,7 +129,7 @@
                         <c:forEach items="#{GroupDetailsModel.members}" 
                                    var="member">
                             <li class="list-group-item">
-                                <a href="#">
+                                <a href="#{mvc.uri('UsersController#getUserDetails', { 'userIdentifier': member.userName })}">
                                     #{member.userName}
                                 </a>
                             </li>
@@ -143,7 +143,7 @@
                 </c:otherwise>
             </c:choose>
 
-            <div class="d-flex mb-1">
+            <div class="d-flex mt-4 mb-1">
                 <h2 class="mr-2">
                     #{AdminMessages['usersgroupsroles.groups.groups_details.roles.heading']}
                 </h2>
@@ -166,7 +166,7 @@
                      id="group-roles-dialog"
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="#{mvc.uri('GroupFormController#updateRoleMemberships', {'groupIdentifier': GroupDetailsModel.groupName })}"
+                        <form action="#{mvc.uri('GroupMembersRolesController#updateRoleMemberships', {'groupIdentifier': GroupDetailsModel.groupName })}"
                               class="modal-content"
                               method="post">
                             <div class="modal-header">
@@ -188,7 +188,7 @@
                                         <input class="form-check-input"
                                                checked="#{entry.member ? 'checked' : ''}"
                                                id="role-#{entry.roleName}"
-                                               name="groupRoles[]"
+                                               name="groupRoles"
                                                value="#{entry.roleName}"
                                                type="checkbox" />
                                         <label for="role#{entry.roleName}">
@@ -217,9 +217,11 @@
                     <ul class="list-group mt-1 mb-4">
                         <c:forEach items="#{GroupDetailsModel.roles}" 
                                    var="role">
-                            <a href="#">
+                            <li class="list-group-item">
+                            <a href="#{mvc.uri('RolesController#getRoleDetails', {'roleIdentifier': role.roleName})}">
                                 #{role.roleName}
                             </a>
+                            </li>
                         </c:forEach>
                     </ul>
                 </c:when>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
index eb974816d..573c25805 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-details.xhtml
@@ -296,7 +296,7 @@
                      id="user-groups-dialog" 
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="#{mvc.uri('UserFormController#updateGroupMemberships', {'userIdentifier': UserDetailsModel.name})}" 
+                        <form action="#{mvc.uri('UserGroupsRolesController#updateGroupMemberships', {'userIdentifier': UserDetailsModel.name})}" 
                               class="modal-content" 
                               method="post">
                             <div class="modal-header">
@@ -318,7 +318,7 @@
                                         <input class="form-check-input"
                                                checked="#{entry.member ? 'checked' : ''}"
                                                id="group-#{entry.groupName}" 
-                                               name="userGroups[]"
+                                               name="userGroups"
                                                value="#{entry.groupName}"
                                                type="checkbox" />
                                         <label class="form-check-label"
@@ -345,9 +345,10 @@
             <c:choose>
                 <c:when test="#{UserDetailsModel.groupMemberships.size() > 0}">
                     <ul class="list-group mt-1">
-                        <c:forEach items="#{UserDetailsModel.groupMemberships}">
+                        <c:forEach items="#{UserDetailsModel.groupMemberships}" 
+                                   var="group">
                             <li class="list-group-item">
-                                <a href="#">
+                                <a href="#{mvc.uri('GroupsController#getGroupDetails', {'groupIdentifier': group.groupName})}">
                                     #{group.groupName}
                                 </a>
                             </li>
@@ -361,7 +362,7 @@
                 </c:otherwise>
             </c:choose>
 
-            <div class="d-flex mb-1">
+            <div class="d-flex mt-4 mb-1">
                 <h2 class="mr-2">
                     #{AdminMessages['usersgroupsroles.users.user_details.roles.heading']}
                 </h2>
@@ -384,7 +385,7 @@
                      id="user-roles-dialog"
                      tabindex="-1">
                     <div class="modal-dialog">
-                        <form action="#{mvc.uri('UserFormController#updateRoleMemberships', {'userIdentifier': UserDetailsModel.name })}"
+                        <form action="#{mvc.uri('UserGroupsRolesController#updateRoleMemberships', {'userIdentifier': UserDetailsModel.name })}"
                               class="modal-content"
                               method="post">
                             <div class="modal-header">
@@ -406,7 +407,7 @@
                                         <input class="form-check-input"
                                                checked="#{entry.member ? 'checked' : ''}"
                                                id="role-#{entry.roleName}"
-                                               name="userRoles[]"
+                                               name="userRoles"
                                                value="#{entry.roleName}"
                                                type="checkbox" />
                                         <label for="role#{entry.roleName}">
@@ -435,7 +436,7 @@
                     <ul class="list-group mt-1 mb-4">
                         <c:forEach items="#{UserDetailsModel.roles}" var="role">
                             <li class="list-group-item">
-                                <a href="#">
+                                <a href="#{mvc.uri('RolesController#getRoleDetails', {'roleIdentifier': role.roleName })}">
                                     #{role.roleName}
                                 </a>
                             </li>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 9590552db..ff1569462 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -5,7 +5,7 @@ applications.description=Verwalten der Anwendungsinstanzen
 imexport.label=Import/Export
 categories.label=Kategorien
 categories.description=Verwaltung der Kategorien
-configuration.label=Konfguration
+configuration.label=Konfiguration
 configuration.description=Bearbeiten der Konfiguration
 dashboard.label=Dashboard
 dashboard.description=Provides access to all applications

From 540e1bd9e6aba20c9747bbd5b1076f899c187c2a Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 22 Oct 2020 21:07:58 +0200
Subject: [PATCH 24/93] Management for users, groups and roles: All necessary
 functions should now be implemented

---
 .../usersgroupsroles/GroupFormController.java |  10 +-
 .../GroupMembersRolesController.java          |   2 +-
 .../usersgroupsroles/GroupUserFormEntry.java  |  13 +-
 .../usersgroupsroles/GroupUserMembership.java |  10 +-
 .../usersgroupsroles/GroupsController.java    |  76 ++++++++
 .../usersgroupsroles/RoleDetailsModel.java    | 137 ++++++++++++++
 .../usersgroupsroles/RoleFormController.java  | 142 ++++++++++++++
 .../RoleMembersController.java                | 177 ++++++++++++++++++
 .../usersgroupsroles/RolePartyFormEntry.java  |  67 +++++++
 .../usersgroupsroles/RolePartyMembership.java |  78 ++++++++
 .../usersgroupsroles/RolePermission.java      | 113 +++++++++++
 .../usersgroupsroles/RolesController.java     | 177 +++++++++++++++++-
 .../usersgroupsroles/UserFormController.java  |   2 +-
 .../UsersGroupsRolesPage.java                 |   2 +
 .../admin/users-groups-roles/group-form.xhtml |   3 +-
 .../users-groups-roles/group-not-found.xhtml  |   6 +-
 .../ui/admin/users-groups-roles/groups.xhtml  |   2 +-
 .../users-groups-roles/role-details.xhtml     | 149 +++++++++++++++
 .../admin/users-groups-roles/role-form.xhtml  |  75 ++++++++
 .../users-groups-roles/role-not-found.xhtml   |  41 ++++
 .../ui/admin/users-groups-roles/roles.xhtml   | 107 ++++++++++-
 .../org/libreccm/ui/AdminBundle.properties    |  30 +++
 .../org/libreccm/ui/AdminBundle_de.properties |  30 +++
 23 files changed, 1417 insertions(+), 32 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleDetailsModel.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleFormController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleMembersController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyFormEntry.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyMembership.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePermission.java
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-details.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
index 18e11c4ab..22784c16b 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
@@ -23,25 +23,17 @@ import org.libreccm.api.IdentifierParser;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.Group;
-import org.libreccm.security.GroupManager;
 import org.libreccm.security.GroupRepository;
 import org.libreccm.security.RequiresPrivilege;
-import org.libreccm.security.User;
-import org.libreccm.security.UserRepository;
 import org.libreccm.ui.admin.AdminMessages;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
-import javax.mvc.MvcContext;
 import javax.mvc.binding.BindingResult;
 import javax.mvc.binding.MvcBinding;
 import javax.transaction.Transactional;
@@ -144,7 +136,7 @@ public class GroupFormController {
                     )
                 )
             );
-            return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
+            return "org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml";
         }
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java
index 1c70363de..80a899071 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java
@@ -82,7 +82,7 @@ public class GroupMembersRolesController {
     private UserRepository userRepository;
 
     @POST
-    @Path("{groupIdentifier}/groups")
+    @Path("{groupIdentifier}/members")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java
index 022dad62d..d56e71d83 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java
@@ -23,13 +23,13 @@ package org.libreccm.ui.admin.usersgroupsroles;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class GroupUserFormEntry {
-    
+
     private long userId;
-    
+
     private String userUuid;
-    
+
     private String userName;
-    
+
     private boolean member;
 
     public long getUserId() {
@@ -63,8 +63,5 @@ public class GroupUserFormEntry {
     public void setMember(final boolean member) {
         this.member = member;
     }
-    
-    
-    
-    
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserMembership.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserMembership.java
index 277f30bef..3dcd0865a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserMembership.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserMembership.java
@@ -20,6 +20,8 @@ package org.libreccm.ui.admin.usersgroupsroles;
 
 import org.libreccm.security.User;
 
+import java.util.Objects;
+
 /**
  * Model friendly representation of a member of a group.
  *
@@ -42,7 +44,7 @@ public class GroupUserMembership implements Comparable<GroupUserMembership> {
     public GroupUserMembership() {
         // Nothing
     }
-    
+
     public GroupUserMembership(final User user) {
         userId = user.getPartyId();
         userUuid = user.getUuid();
@@ -51,7 +53,7 @@ public class GroupUserMembership implements Comparable<GroupUserMembership> {
         givenName = user.getGivenName();
         familyName = user.getFamilyName();
     }
-    
+
     public long getUserId() {
         return userId;
     }
@@ -102,7 +104,9 @@ public class GroupUserMembership implements Comparable<GroupUserMembership> {
 
     @Override
     public int compareTo(final GroupUserMembership other) {
-        int result = userName.compareTo(other.getUserName());
+        int result = userName.compareTo(
+            Objects.requireNonNull(other.getUserName())
+        );
         if (result == 0) {
             return primaryEmailAddress.compareTo(other.getPrimaryEmailAddress());
         } else {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
index 060853ca4..69147e572 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
@@ -23,8 +23,12 @@ import org.libreccm.api.IdentifierParser;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.Group;
+import org.libreccm.security.GroupManager;
+import org.libreccm.security.GroupMembership;
 import org.libreccm.security.GroupRepository;
 import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.RoleManager;
+import org.libreccm.security.RoleMembership;
 import org.libreccm.ui.Message;
 import org.libreccm.ui.MessageType;
 import org.libreccm.ui.admin.AdminMessages;
@@ -38,7 +42,9 @@ import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
 import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
@@ -57,6 +63,9 @@ public class GroupsController {
     @Inject
     private GroupDetailsModel groupDetailsModel;
 
+    @Inject
+    private GroupManager groupManager;
+
     @Inject
     private GroupRepository groupRepository;
 
@@ -66,6 +75,9 @@ public class GroupsController {
     @Inject
     private Models models;
 
+    @Inject
+    private RoleManager roleManager;
+
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -171,4 +183,68 @@ public class GroupsController {
         }
     }
 
+    @POST
+    @Path("/{groupIdentifier}/delete")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String deleteGroup(
+        @PathParam("groupIdentifier") final String groupIdentifierParam,
+        @FormParam("confirmed") final String confirmed
+    ) {
+        if ("true".equals(confirmed)) {
+            final Identifier identifier = identifierParser.parseIdentifier(
+                groupIdentifierParam
+            );
+            final Optional<Group> result;
+            switch (identifier.getType()) {
+                case ID:
+                    result = groupRepository.findById(
+                        Long.parseLong(identifier.getIdentifier())
+                    );
+                    break;
+                case UUID:
+                    result = groupRepository.findByUuid(identifier
+                        .getIdentifier());
+                    break;
+                default:
+                    result = groupRepository.findByName(identifier
+                        .getIdentifier());
+                    break;
+            }
+
+            if (result.isPresent()) {
+                final Group group = result.get();
+                for (final RoleMembership roleMembership : group
+                    .getRoleMemberships()) {
+                    roleManager.removeRoleFromParty(
+                        roleMembership.getRole(), group
+                    );
+                }
+
+                for (final GroupMembership groupMembership : group
+                    .getMemberships()) {
+                    groupManager.removeMemberFromGroup(
+                        groupMembership.getMember(), group
+                    );
+                }
+
+                groupRepository.delete(result.get());
+            } else {
+                groupDetailsModel.addMessage(
+                    new Message(
+                        adminMessages.getMessage(
+                            "usersgroupsroles.groups.not_found.message",
+                            Arrays.asList(groupIdentifierParam)
+                        ),
+                        MessageType.WARNING
+                    )
+                );
+                return "org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml";
+            }
+        }
+
+        return "redirect:users-groups-roles/groups";
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleDetailsModel.java
new file mode 100644
index 000000000..a22f07c45
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleDetailsModel.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.security.Party;
+import org.libreccm.security.PartyRepository;
+import org.libreccm.security.Role;
+import org.libreccm.security.RoleMembership;
+import org.libreccm.ui.Message;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.transaction.Transactional;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("RoleDetailsModel")
+public class RoleDetailsModel {
+
+    @Inject
+    private PartyRepository partyRepository;
+
+    private long roleId;
+
+    private String uuid;
+
+    private String roleName;
+
+    private List<RolePartyMembership> members;
+
+    private List<RolePermission> permissions;
+
+    private final List<Message> messages;
+
+    public RoleDetailsModel() {
+        this.messages = new ArrayList<>();
+    }
+
+    public List<Message> getMessages() {
+        return Collections.unmodifiableList(messages);
+    }
+
+    public void addMessage(final Message message) {
+        messages.add(message);
+    }
+
+    public long getRoleId() {
+        return roleId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public List<RolePartyMembership> getMembers() {
+        return Collections.unmodifiableList(members);
+    }
+
+    public List<RolePermission> getPermissions() {
+        return Collections.unmodifiableList(permissions);
+    }
+
+    public List<RolePartyFormEntry> getRolePartyFormEnties() {
+        return partyRepository
+            .findAll()
+            .stream()
+            .map(this::buildRolePartyFormEntry)
+            .collect(Collectors.toList());
+    }
+
+    @Transactional(Transactional.TxType.REQUIRED)
+    protected void setRole(final Role role) {
+        Objects.requireNonNull(role);
+        
+        roleId = role.getRoleId();
+        uuid = role.getUuid();
+        roleName = role.getName();
+        members = role
+            .getMemberships()
+            .stream()
+            .map(RoleMembership::getMember)
+            .map(RolePartyMembership::new)
+            .sorted()
+            .collect(Collectors.toList());
+    }
+
+    public boolean isNewRole() {
+        return roleId == 0;
+    }
+
+    private RolePartyFormEntry buildRolePartyFormEntry(final Party party) {
+        final RolePartyFormEntry entry = new RolePartyFormEntry();
+        entry.setPartyId(party.getPartyId());
+        entry.setPartyUuid(party.getUuid());
+        entry.setPartyName(party.getName());
+        entry.setMember(
+            members
+                .stream()
+                .anyMatch(
+                    membership -> membership.getPartyUuid().equals(party
+                        .getUuid())
+                )
+        );
+        return entry;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleFormController.java
new file mode 100644
index 000000000..80df106d9
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleFormController.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.Role;
+import org.libreccm.security.RoleRepository;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.mvc.binding.BindingResult;
+import javax.mvc.binding.MvcBinding;
+import javax.transaction.Transactional;
+import javax.validation.constraints.NotBlank;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@Controller
+@Path("/users-groups-roles/roles/")
+@RequestScoped
+public class RoleFormController {
+
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private BindingResult bindingResult;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private Models models;
+
+    @Inject
+    private RoleRepository roleRepository;
+
+    @MvcBinding
+    @FormParam("roleName")
+    @NotBlank
+    private String roleName;
+
+    @POST
+    @Path("/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String createRole() {
+        if (bindingResult.isFailed()) {
+            models.put("errors", bindingResult.getAllMessages());
+            return "org/libreccm/ui/admin/users-groups-roles/role-form.xhtml";
+        }
+
+        final Role role = new Role();
+        role.setName(roleName);
+        roleRepository.save(role);
+
+        return "redirect:users-groups-roles/roles";
+    }
+
+    @POST
+    @Path("{roleIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateRole(
+        @PathParam("roleIdentifier") final String roleIdentifierParam
+    ) {
+        if (bindingResult.isFailed()) {
+            models.put("errors", bindingResult.getAllMessages());
+            return "org/libreccm/ui/admin/users-groups-roles/role-form.xhtml";
+        }
+
+        final Identifier identifier = identifierParser.parseIdentifier(
+            roleIdentifierParam
+        );
+        final Optional<Role> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = roleRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = roleRepository.findByUuid(identifier.getIdentifier());
+                break;
+            default:
+                result = roleRepository.findByName(identifier.getIdentifier());
+                break;
+        }
+        
+        if (result.isPresent()) {
+            final Role role = result.get();
+            role.setName(roleName);
+            
+            return "redirect:users-groups-roles/roles";
+        } else {
+            models.put(
+                "errors", Arrays.asList(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.roles.not_found.message",
+                        Arrays.asList(roleIdentifierParam)
+                    )
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml";
+        }
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleMembersController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleMembersController.java
new file mode 100644
index 000000000..8bf005a29
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleMembersController.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.Party;
+import org.libreccm.security.PartyRepository;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.Role;
+import org.libreccm.security.RoleManager;
+import org.libreccm.security.RoleRepository;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@Controller
+@Path("/users-groups-roles/roles/")
+@RequestScoped
+
+public class RoleMembersController {
+
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private Models models;
+
+    @Inject
+    private PartyRepository partyRepository;
+
+    @Inject
+    private RoleManager roleManager;
+
+    @Inject
+    private RoleRepository roleRepository;
+
+    @POST
+    @Path("{roleIdentifier}/members")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateRoleMemberships(
+        @PathParam("roleIdentifier") final String roleIdentifierParam,
+        @FormParam("roleMembers") final String[] roleMembersParam
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            roleIdentifierParam
+        );
+        final Optional<Role> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = roleRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = roleRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = roleRepository.findByName(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Role role = result.get();
+            final List<String> memberNames = Arrays.asList(roleMembersParam);
+
+            // Check for new members
+            final List<String> newMemberNames = memberNames
+                .stream()
+                .filter(memberName -> !hasMember(role, memberName))
+                .collect(Collectors.toList());
+
+            // Check for removed members
+            final List<String> removedMemberNames = role
+                .getMemberships()
+                .stream()
+                .map(membership -> membership.getMember().getName())
+                .filter(memberName -> !memberNames.contains(memberName))
+                .collect(Collectors.toList());
+
+            for (final String newMemberName : newMemberNames) {
+                addNewMember(role, newMemberName);
+            }
+
+            for (final String removedMemberName : removedMemberNames) {
+                removeMember(role, removedMemberName);
+            }
+
+            return String.format(
+                "redirect:/users-groups-roles/roles/%s/details",
+                roleIdentifierParam
+            );
+        } else {
+            models.put(
+                "errors", Arrays.asList(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.roles.not_found.message",
+                        Arrays.asList(roleIdentifierParam)
+                    )
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml";
+        }
+    }
+
+    private boolean hasMember(final Role role, final String memberName) {
+        return role
+            .getMemberships()
+            .stream()
+            .map(membership -> membership.getMember().getName())
+            .anyMatch(name -> name.equals(memberName));
+    }
+    
+    private void addNewMember(final Role role, final String newMemberName) {
+        final Optional<Party> result = partyRepository.findByName(
+            newMemberName
+        );
+        if (result.isPresent()) {
+            final Party party = result.get();
+            roleManager.assignRoleToParty(role, party);
+        }
+    }
+    
+    private void removeMember(final Role role, final String removedMemberName) {
+        final Optional<Party> result = partyRepository.findByName(
+            removedMemberName
+        );
+        if (result.isPresent()) {
+            final Party party = result.get();
+            roleManager.removeRoleFromParty(role, party);
+        }
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyFormEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyFormEntry.java
new file mode 100644
index 000000000..cab35dc5e
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyFormEntry.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class RolePartyFormEntry {
+
+    private long partyId;
+
+    private String partyUuid;
+
+    private String partyName;
+
+    private boolean member;
+
+    public long getPartyId() {
+        return partyId;
+    }
+
+    public void setPartyId(final long partyId) {
+        this.partyId = partyId;
+    }
+
+    public String getPartyUuid() {
+        return partyUuid;
+    }
+
+    public void setPartyUuid(final String partyUuid) {
+        this.partyUuid = partyUuid;
+    }
+
+    public String getPartyName() {
+        return partyName;
+    }
+
+    public void setPartyName(final String partyName) {
+        this.partyName = partyName;
+    }
+
+    public boolean isMember() {
+        return member;
+    }
+
+    public void setMember(final boolean member) {
+        this.member = member;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyMembership.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyMembership.java
new file mode 100644
index 000000000..c5b272468
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyMembership.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.security.Party;
+
+import java.util.Objects;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class RolePartyMembership implements Comparable<RolePartyMembership>{
+    
+    private long partyId;
+    
+    private String partyUuid;
+    
+    private String partyName;
+    
+    public RolePartyMembership() {
+        // Nothing
+    }
+    
+    public RolePartyMembership(final Party party) {
+        partyId = party.getPartyId();
+        partyUuid = party.getUuid();
+        partyName = party.getName();
+    }
+
+    public long getPartyId() {
+        return partyId;
+    }
+
+    public void setPartyId(final long partyId) {
+        this.partyId = partyId;
+    }
+
+    public String getPartyUuid() {
+        return partyUuid;
+    }
+
+    public void setPartyUuid(final String partyUuid) {
+        this.partyUuid = partyUuid;
+    }
+
+    public String getPartyName() {
+        return partyName;
+    }
+
+    public void setPartyName(final String partyName) {
+        this.partyName = partyName;
+    }
+    
+    @Override
+    public int compareTo(final RolePartyMembership other) {
+        return partyName.compareTo(
+            Objects.requireNonNull(other).getPartyName()
+        );
+    }
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePermission.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePermission.java
new file mode 100644
index 000000000..c17199a7f
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePermission.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.usersgroupsroles;
+
+import org.libreccm.security.Permission;
+
+import java.util.Objects;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class RolePermission implements Comparable<RolePermission> {
+
+    private long permissionId;
+
+    private String permissionUuid;
+
+    private String grantedPrivilege;
+
+    private String objectName;
+
+    private boolean objectPermission;
+
+    public RolePermission() {
+        // Nothing
+    }
+
+    public RolePermission(final Permission permission) {
+        permissionId = permission.getPermissionId();
+        permissionUuid = permission.getUuid();
+        grantedPrivilege = permission.getGrantedPrivilege();
+        objectPermission = permission.getObject() != null;
+        if (objectPermission) {
+            objectName = permission.getObject().getDisplayName();
+        }
+    }
+
+    public long getPermissionId() {
+        return permissionId;
+    }
+
+    public void setPermissionId(final long permissionId) {
+        this.permissionId = permissionId;
+    }
+
+    public String getPermissionUuid() {
+        return permissionUuid;
+    }
+
+    public void setPermissionUuid(final String permissionUuid) {
+        this.permissionUuid = permissionUuid;
+    }
+
+    public String getGrantedPrivilege() {
+        return grantedPrivilege;
+    }
+
+    public void setGrantedPrivilege(final String grantedPrivilege) {
+        this.grantedPrivilege = grantedPrivilege;
+    }
+
+    public String getObjectName() {
+        return objectName;
+    }
+
+    public void setObjectName(final String objectName) {
+        this.objectName = objectName;
+    }
+
+    public boolean isObjectPermission() {
+        return objectPermission;
+    }
+
+    public void setObjectPermission(final boolean objectPermission) {
+        this.objectPermission = objectPermission;
+    }
+
+    @Override
+    public int compareTo(final RolePermission other) {
+        int result = Objects.compare(
+            grantedPrivilege,
+            Objects.requireNonNull(other).getGrantedPrivilege(),
+            (privilege1, privilege2) -> privilege1.compareTo(privilege2)
+        );
+        if (result == 0 && isObjectPermission()) {
+            return Objects.compare(
+                objectName,
+                Objects.requireNonNull(other).getObjectName(),
+                (name1, name2) -> name1.compareTo(name2)
+            );
+        } else {
+            return result;
+        }
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
index d694dd0b7..f71b5080e 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
@@ -18,14 +18,29 @@
  */
 package org.libreccm.ui.admin.usersgroupsroles;
 
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.security.Role;
+import org.libreccm.security.RoleRepository;
+import org.libreccm.ui.Message;
+import org.libreccm.ui.MessageType;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.mvc.Models;
 import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
@@ -38,11 +53,29 @@ import javax.ws.rs.PathParam;
 @Path("/users-groups-roles/roles")
 public class RolesController {
 
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private RoleDetailsModel rolesDetailsModel;
+
+    @Inject
+    private RoleRepository roleRepository;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private Models models;
+
     @GET
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String getRoles() {
+        final List<Role> roles = roleRepository.findAll();
+        models.put("roles", roles);
+
         return "org/libreccm/ui/admin/users-groups-roles/roles.xhtml";
     }
 
@@ -54,7 +87,149 @@ public class RolesController {
     public String getRoleDetails(
         @PathParam("roleIdentifier") final String roleIdentifierParam
     ) {
-        throw new UnsupportedOperationException();
+        final Identifier identifier = identifierParser.parseIdentifier(
+            roleIdentifierParam
+        );
+        final Optional<Role> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = roleRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = roleRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = roleRepository.findByName(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            rolesDetailsModel.setRole(result.get());
+            return "org/libreccm/ui/admin/users-groups-roles/role-details.xhtml";
+        } else {
+            rolesDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.roles.not_found_message",
+                        Arrays.asList(roleIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml";
+        }
+    }
+
+    @GET
+    @Path("/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String newRole() {
+        return "org/libreccm/ui/admin/users-groups-roles/role-form.xhtml";
+    }
+
+    @GET
+    @Path("/{roleIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String editRole(
+        @PathParam("roleIdentifier") final String roleIdentifierParam
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            roleIdentifierParam
+        );
+        final Optional<Role> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = roleRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = roleRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = roleRepository.findByName(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            rolesDetailsModel.setRole(result.get());
+            return "org/libreccm/ui/admin/users-groups-roles/role-form.xhtml";
+        } else {
+            rolesDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "usersgroupsroles.roles.not_found_message",
+                        Arrays.asList(roleIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml";
+        }
+    }
+
+    @POST
+    @Path("/{roleIdentifier}/delete")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String deleteRole(
+        @PathParam("roleIdentifier") final String roleIdentifierParam,
+        @FormParam("confirmed") final String confirmed
+    ) {
+        if ("true".equals(confirmed)) {
+            final Identifier identifier = identifierParser.parseIdentifier(
+                roleIdentifierParam
+            );
+            final Optional<Role> result;
+            switch (identifier.getType()) {
+                case ID:
+                    result = roleRepository.findById(
+                        Long.parseLong(identifier.getIdentifier())
+                    );
+                    break;
+                case UUID:
+                    result = roleRepository.findByUuid(
+                        identifier.getIdentifier()
+                    );
+                    break;
+                default:
+                    result = roleRepository.findByName(
+                        identifier.getIdentifier()
+                    );
+                    break;
+            }
+
+            if (result.isPresent()) {
+                roleRepository.delete(result.get());
+            } else {
+                rolesDetailsModel.addMessage(
+                    new Message(
+                        adminMessages.getMessage(
+                            "usersgroupsroles.roles.not_found_message",
+                            Arrays.asList(roleIdentifierParam)
+                        ),
+                        MessageType.WARNING
+                    )
+                );
+                return "org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml";
+            }
+        }
+
+        return "redirect:users-groups-roles/roles";
     }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
index ee0b9688a..57cbb9968 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
@@ -205,7 +205,7 @@ public class UserFormController {
                            Arrays.asList(userIdentifierParam)
                        )
                    ));
-            return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+            return "org/libreccm/ui/admin/users-groups-roles/user-not-found.xhtml";
         }
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
index ec9db6a98..2a2c833d5 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
@@ -41,6 +41,8 @@ public class UsersGroupsRolesPage implements AdminPage {
         classes.add(GroupFormController.class);
         classes.add(GroupMembersRolesController.class);
         classes.add(RolesController.class);
+        classes.add(RoleFormController.class);
+        classes.add(RoleMembersController.class);
         classes.add(UsersController.class);
         classes.add(UserFormController.class);
         classes.add(UserGroupsRolesController.class);
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
index 3c7ed9b55..8dbdfcfc7 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
@@ -21,12 +21,11 @@
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvn.uri('GroupsController#getGroupDetails', { 'groupIdentfier': group.name })}">
+                <a href="#{mvn.uri('GroupsController#getGroupDetails', { 'groupIdentfier': GroupDetailsModel.groupName })}">
                     #{GroupDetailsModel.groupName}
                 </a>
             </li>
             <li>
-
                 #{GroupDetailsModel.newGroup ? AdminMessages['usersgroupsroles.groups.breadcrumb.new'] : AdminMessages['usersgroupsroles.groups.breadcrumb.edit']}
             </li>
         </ui:define>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml
index 89a5ed0cc..23cbab073 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-not-found.xhtml
@@ -16,12 +16,12 @@
                 </a>
             </li>
             <li class="breadcrumb-item">
-                <a href="#{mvc.uri('UsersController#getUsers')}">
-                    #{AdminMessages['usersgroupsroles.users.label']}
+                <a href="#{mvc.uri('UsersController#getGroups')}">
+                    #{AdminMessages['usersgroupsroles.groups.label']}
                 </a>
             </li>
             <li class="breadcrumb-item">
-                #{AdminMessages['usersgroupsroles.users.not_found.title']}
+                #{AdminMessages['usersgroupsroles.groups.not_found.title']}
             </li>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
index 75688c26c..fe90baa6f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
@@ -83,7 +83,7 @@
                                          id="confirm-delete-#{group.name}"
                                          tabindex="-1">
                                         <div class="modal-dialog">
-                                            <form action="#"
+                                            <form action="#{mvc.uri('GroupsController#deleteGroup', {'groupIdentifier': group.name })}"
                                                   class="modal-content"
                                                   method="post">
                                                 <div class="modal-header">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-details.xhtml
new file mode 100644
index 000000000..b532cd5aa
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-details.xhtml
@@ -0,0 +1,149 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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">
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="roles" />
+        <ui:param name="title"
+                  value="#{AdminMessages.getMessage('usersgroupsroles.roles.role_details.title', [RoleDetailsModel.roleName])}" />
+
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('RolesController#getRoles')}">
+                    #{AdminMessages['usersgroupsroles.roles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                #{RoleDetailsModel.roleName}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <dl>
+                <div>
+                    <dt>#{AdminMessages['usersgroupsroles.roles.role_details.roleId']}</dt>
+                    <dd>#{RoleDetailsModel.roleName}</dd>
+                </div>
+                <div>
+                    <dt>#{AdminMessages['usersgroupsroles.roles.role_details.uuid']}</dt>
+                    <dd>#{RoleDetailsModel.uuid}</dd>
+                </div>
+                <div>
+                    <dt>#{AdminMessages['usersgroupsroles.roles.role_details.name']}</dt>
+                    <dd>#{RoleDetailsModel.roleName}</dd>
+                </div>
+            </dl>
+            <a class="btn btn-primary"
+               href="#{mvc.uri('RolesController#editRole', {'roleIdentifier': RoleDetailsModel.roleName })}">
+                <svg class="bi"
+                     width="1em"
+                     height="1em"
+                     fill="currentColor">
+                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                </svg>
+                <span>
+                    #{AdminMessages['usersgroupsroles.roles.role_details.edit_role']}
+                </span>
+            </a>
+
+            <div class="d-flex mt-3 mb-1">
+                <h2 class="mr-2">
+                    #{AdminMessages['usersgroupsroles.roles.role_details.members.heading']}
+                </h2>
+                <button class="btn btn-primary"
+                        data-toggle="modal"
+                        data-target="#role-members-dialog"
+                        type="button">
+                    <svg class="bi"
+                         width="1em"
+                         height="1em"
+                         fill="currentColor">
+                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                    </svg>
+                    <span>#{AdminMessages['usersgroupsroles.roles.role_details.members.edit']}</span>
+                </button>
+                <div aria-labelledby="role-members-dialog-title"
+                     aria-hidden="true"
+                     class="modal fade"
+                     data-backdrop="static"
+                     id="role-members-dialog"
+                     tabindex="-1">
+                    <div class="modal-dialog">
+                        <form action="#{mvc.uri('RoleMembersController#updateRoleMemberships', {'roleIdentifier': RoleDetailsModel.roleName } )}"
+                              class="modal-content"
+                              method="post">
+                            <div class="modal-header">
+                                <h3 class="modal-title"
+                                    id="role-members-dialog-title">
+                                    #{AdminMessages['usersgroupsroles.roles.role_details.members.dialog.title']}
+                                </h3>
+                                <button aria-label="#{AdminMessages['usersgroupsroles.roles.role_details.members.dialog.close']}"
+                                        class="close"
+                                        data-dismiss="modal"
+                                        type="button">
+                                    <span aria-hidden="true">&times;</span>
+                                </button>
+                            </div>
+                            <div class="modal-body">
+                                <c:forEach items="#{RoleDetailsModel.rolePartyFormEnties}"
+                                           var="entry">
+                                    <div class="form-check form-check-inline">
+                                        <input class="form-check-input" 
+                                               checked="#{entry.member ? 'checked' : ''}" 
+                                               id="party-#{entry.partyName}"
+                                               name="roleMembers"
+                                               value="#{entry.partyName}"
+                                               type="checkbox" />
+                                        <label class="form-check-label"
+                                               for="party-#{entry.partyName}">
+                                            #{entry.partyName}
+                                        </label>
+
+                                    </div>
+                                </c:forEach>
+                            </div>
+                            <div class="modal-footer">
+                                <button class="btn btn-secondary"
+                                        data-dismiss="modal"
+                                        type="button">
+                                    #{AdminMessages['usersgroupsroles.roles.role_details.members.dialog.close']}
+                                </button>
+                                <button class="btn btn-primary"
+                                        type="submit">
+                                    #{AdminMessages['usersgroupsroles.roles.role_details.members.dialog.save']}
+                                </button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <c:choose>
+                <c:when test="#{RoleDetailsModel.members.size() > 0}">
+                    <ul class="list-group mt-1">
+                        <c:forEach items="#{RoleDetailsModel.members}" 
+                                   var="member">
+                            <li class="list-group-item">
+                                #{member.partyName}
+                            </li>
+                        </c:forEach>
+                    </ul>
+                </c:when>
+                <c:otherwise>
+                    <div class="alert alert-info" role="alert">
+                        #{AdminMessages['usersgroupsroles.roles.role_details.members.none']}
+                    </div>
+                </c:otherwise>
+            </c:choose>
+        </ui:define>
+    </ui:composition>
+</html>
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml
new file mode 100644
index 000000000..2fe7741c2
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="users" />
+        <ui:param name="title"
+                  value="#{RoleDetailsModel.newRole ? AdminMessages['usersgroupsroles.roles.create.title'] : AdminMessages.getMessage('usersgroupsroles.roles.edit.title', [RoleDetailsModel.roleName]) }" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('GroupsController#getGroups')}">
+                    #{AdminMessages['usersgroupsroles.roles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvn.uri('GroupsController#getGroupDetails', { 'roleIdentfier': RoleDetailsModel.roleName })}">
+                    #{RoleDetailsModel.roleName}
+                </a>
+            </li>
+            <li>
+                #{RoleDetailsModel.newRole ? AdminMessages['usersgroupsroles.roles.breadcrumb.new'] : AdminMessages['usersgroupsroles.roles.breadcrumb.edit']}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <c:forEach items="#{errors}" var="error">
+                <div class="alert alert-danger" role="alert">
+                    #{error}
+                </div>
+            </c:forEach>
+            
+            <form action="#{RoleDetailsModel.newRole ? mvc.uri('RoleFormController#createRole') : mvc.uri('RoleFormController#updateRole', {'roleIdentifier' : RoleDetailsModel.roleName })}"
+                  method="post">
+                <div class="form-group">
+                    <label for="rolename">
+                        #{AdminMessages['usersgroupsroles.roles.form.rolename.label']}
+                    </label>
+                    <input aria-described-by="rolename-help"
+                           class="form-control" 
+                           id="rolename" 
+                           name="roleName" 
+                           value="#{RoleDetailsModel.roleName}"
+                           type="text" />
+                    <small class="form-text text-muted"
+                           id="rolename-help">
+                        #{AdminMessages['usersgroupsroles.roles.form.rolename.help']}
+                    </small>
+                </div>
+                <a class="btn btn-warning" 
+                   href="#{mvc.uri('RolesController#getRoles')}">
+                    #{AdminMessages['usersgroupsroles.roles.form.buttons.cancel']}
+                </a>
+                <button class="btn btn-success" type="submit">
+                    <c:choose>
+                        <c:when test="#{RoleDetailsModel.newRole}">
+                            #{AdminMessages['usersgroupsroles.roles.form.buttons.create']}
+                        </c:when>
+                        <c:otherwise>
+                            #{AdminMessages['usersgroupsroles.roles.form.buttons.save']}
+                        </c:otherwise>
+                    </c:choose>
+                </button>
+            </form>
+        </ui:define>
+        
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml
new file mode 100644
index 000000000..25f4f3a0d
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-not-found.xhtml
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/users-groups-roles.xhtml">
+        <ui:param name="activePage" value="usersgroupsroles" />
+        <ui:param name="activePanel" value="groups" />
+        <ui:param name="title"
+                  value="#{AdminMessages('usersgroupsroles.roles.not_found.title')}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersGroupsRolesController#getOverview')}">
+                    #{AdminMessages['usersgroupsroles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('UsersController#getRoles')}">
+                    #{AdminMessages['usersgroupsroles.roles.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item">
+                #{AdminMessages['usersgroupsroles.roles.not_found.title']}
+            </li>
+        </ui:define>
+
+        <ui:define name="panel">
+            <c:forEach items="#{UserDetailsModel.messages}" var="message">
+                <div class="alert alert-#{message.messageType}" role="alert">
+                    #{message}
+                </div>
+            </c:forEach>
+        </ui:define>
+
+    </ui:composition>
+
+
+</html>
+
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
index 139633fc6..5b0b7a27f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/roles.xhtml
@@ -1,8 +1,9 @@
-<!DOCTYPE html>
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       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:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:xlink="http://www.w3.org/1999/xlink">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles.xhtml">
         <ui:param name="activePage" value="usersgroupsroles" />
         <ui:param name="activePanel" value="roles" />
@@ -21,7 +22,107 @@
         </ui:define>
 
         <ui:define name="panel">
-            <p>Roles placeholder</p>
+            <div class="row mb-2">
+                <div class="col-sm-9">
+
+                </div>
+                <div class="col-sm-3 text-right">
+                    <a class="btn btn-secondary"
+                       href="#{mvc.uri('RolesController#newRole')}">
+                        <svg class="bi"
+                             width="1em"
+                             height="1em"
+                             fill="currentColor">
+                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
+                        </svg>
+                        <span>#{AdminMessages['usersgroupsroles.roles.add']}</span>
+                    </a>
+                </div>
+            </div>
+            <table class="table table-hover groups-table">
+                <thead class="thead-light">
+                    <tr>
+                        <th>#{AdminMessages['usersgroupsroles.roles.table.headers.rolename']}</th>
+                        <th class="text-center" colspan="2">#{AdminMessages['usersgroupsroles.roles.table.headers.actions']}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <c:forEach items="#{roles}"
+                               var="role">
+                        <tr>
+                            <td>#{role.name}</td>
+                            <td class="text-center action-col">
+                                <a class="btn btn-info"
+                                   href="#{mvc.uri('RolesController#getRoleDetails', { 'roleIdentifier': role.name })}">
+                                    <svg class="bi"
+                                         width="1em"
+                                         height="1em"
+                                         fill="currentColor">
+                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#eye" />
+                                    </svg>
+                                    <span>
+                                        #{AdminMessages['usersgroupsroles.roles.detailslink.label']}
+                                    </span>
+                                </a>
+                            </td>
+                            <td class="text-center action-col">
+                                <button class="btn btn-danger"
+                                        data-toggle="modal"
+                                        data-target="#confirm-delete-#{role.name}"
+                                        href="#">
+                                    <svg class="bi"
+                                         width="1em"
+                                         height="1em"
+                                         fill="currentColor">
+                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                    </svg>
+                                    <span>
+                                        #{AdminMessages['usersgroupsroles.roles.delete.button.label']}
+                                    </span>
+                                </button>
+                                <div class="modal"
+                                     id="confirm-delete-#{role.name}"
+                                     tabindex="-1">
+                                    <div class="modal-dialog">
+                                        <form action="#{mvc.uri('RolesController#deleteRole', { 'roleIdentifier': role.name })}"
+                                              class="modal-content"
+                                              method="post">
+                                            <div class="modal-header">
+                                                <h3 class="modal-title">
+                                                    #{AdminMessages['usersgroupsroles.roles.delete.confirm.title']}
+                                                </h3>
+                                                <button aria-label="#{AdminMessages['usersgroupsroles.roles.delete.confirm.cancel']}"
+                                                        class="close" 
+                                                        data-dismiss="modal" 
+                                                        type="button">
+                                                    <span aria-hidden="true">&times;</span>
+                                                </button>
+                                            </div>
+                                            <div class="modal-body">
+                                                #{AdminMessages.getMessage('usersgroupsroles.roles.delete.confirm.message', [role.name])}
+                                                <input name="confirmed" 
+                                                       type="hidden" 
+                                                       value="true" />
+                                            </div>
+                                            <div class="modal-footer">
+                                                    <button class="btn btn-secondary"
+                                                            data-dismiss="modal"
+                                                            type="button">
+                                                        #{AdminMessages['usersgroupsroles.roles.delete.confirm.cancel']}
+                                                    </button>
+                                                    <button class="btn btn-danger" 
+                                                            type="submit">
+                                                        #{AdminMessages['usersgroupsroles.roles.delete.confirm.yes']}
+                                                    </button>
+                                                </div>
+                                        </form>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                    </c:forEach>
+                </tbody>
+            </table>
         </ui:define>
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index f67098b9c..0597f2db6 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -169,3 +169,33 @@ usersgroupsroles.groups.not_found.title=Group not found
 usersgroupsroles.groups.group_details.groupId=Group ID
 usersgroupsroles.groups.group_details.groupName=Group Name
 usersgroupsroles.users.user_details.additional_email_addresses.cols.address=Address
+usersgroupsroles.roles.not_found_message=Role {0} not found
+usersgroupsroles.roles.not_found.title=Role not found
+usersgroupsroles.roles.role_details.title=Details Role {0}
+usersgroupsroles.roles.role_details.roleId=Role ID
+usersgroupsroles.roles.role_details.name=Name
+usersgroupsroles.roles.role_details.edit_role=Edit role
+usersgroupsroles.roles.role_details.members.heading=Members
+usersgroupsroles.roles.role_details.members.edit=Add/remove members
+usersgroupsroles.roles.role_details.members.dialog.title=Add/remove members
+usersgroupsroles.roles.role_details.members.dialog.close=Cancel
+usersgroupsroles.roles.role_details.members.dialog.save=Apply
+usersgroupsroles.roles.role_details.members.none=This role has no members
+usersgroupsroles.roles.create.title=Create new role
+usersgroupsroles.roles.edit.title=Edit role {0}
+usersgroupsroles.roles.breadcrumb.new=New Role
+usersgroupsroles.roles.breadcrumb.edit=Edit Role
+usersgroupsroles.roles.form.rolename.label=Name
+usersgroupsroles.roles.form.rolename.help=Unique name of the role
+usersgroupsroles.roles.form.buttons.create=Create Role
+usersgroupsroles.roles.form.buttons.save=Save
+usersgroupsroles.roles.add=Add role
+usersgroupsroles.roles.table.headers.rolename=Role
+usersgroupsroles.roles.table.headers.actions=Actions
+usersgroupsroles.roles.detailslink.label=Details
+usersgroupsroles.roles.delete.button.label=Delete
+usersgroupsroles.roles.delete.confirm.title=Are you sure to delele this role?
+usersgroupsroles.roles.delete.confirm.message=Are you sure to delete role {0}?
+usersgroupsroles.roles.delete.confirm.cancel=Cancel
+usersgroupsroles.roles.delete.confirm.yes=Delete role
+usersgroupsroles.roles.role_details.uuid=UUID
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index ff1569462..4c184f715 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -169,3 +169,33 @@ usersgroupsroles.groups.not_found.title=Gruppe nicht gefunden
 usersgroupsroles.groups.group_details.groupId=ID der Gruppe
 usersgroupsroles.groups.group_details.groupName=Name der Gruppe
 usersgroupsroles.users.user_details.additional_email_addresses.cols.address=Adresse
+usersgroupsroles.roles.not_found_message=Rolle {0} nicht verf\u00fcgbar
+usersgroupsroles.roles.not_found.title=Rolle nicht gefunden
+usersgroupsroles.roles.role_details.title=Details Rolle {0}
+usersgroupsroles.roles.role_details.roleId=Rolle ID
+usersgroupsroles.roles.role_details.name=Name
+usersgroupsroles.roles.role_details.edit_role=Rolle bearbeiten
+usersgroupsroles.roles.role_details.members.heading=Mitglieder
+usersgroupsroles.roles.role_details.members.edit=Mitglieder hinzuf\u00fcgen/entfernen
+usersgroupsroles.roles.role_details.members.dialog.title=Mitglieder hinzuf\u00fcgen/entfernen
+usersgroupsroles.roles.role_details.members.dialog.close=Abbrechen
+usersgroupsroles.roles.role_details.members.dialog.save=Anwenden
+usersgroupsroles.roles.role_details.members.none=Diese Rolle hat keine Mitglieder
+usersgroupsroles.roles.create.title=Neue Rolle anlegen
+usersgroupsroles.roles.edit.title=Rolle {0} bearbeiten
+usersgroupsroles.roles.breadcrumb.new=Neue Rolle
+usersgroupsroles.roles.breadcrumb.edit=Rolle bearbeiten
+usersgroupsroles.roles.form.rolename.label=Name
+usersgroupsroles.roles.form.rolename.help=Eindeutiger Name der Rolle
+usersgroupsroles.roles.form.buttons.create=Rolle anlegen
+usersgroupsroles.roles.form.buttons.save=Speichern
+usersgroupsroles.roles.add=Rolle hinzuf\u00fcgen
+usersgroupsroles.roles.table.headers.rolename=Rolle
+usersgroupsroles.roles.table.headers.actions=Aktionen
+usersgroupsroles.roles.detailslink.label=Details
+usersgroupsroles.roles.delete.button.label=L\u00f6schen
+usersgroupsroles.roles.delete.confirm.title=Sind Sie sicher, dass Sie die Rolle l\u00f6schen wollen?
+usersgroupsroles.roles.delete.confirm.message=Sind Sie sicher, dass Sie die Rolle {0} l\u00f6schen wollen?
+usersgroupsroles.roles.delete.confirm.cancel=Abbrechen
+usersgroupsroles.roles.delete.confirm.yes=Rolle l\u00f6schen
+usersgroupsroles.roles.role_details.uuid=UUID

From 743ceeb07decead429a65bb77128544772cd9171 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Fri, 23 Oct 2020 09:45:23 +0200
Subject: [PATCH 25/93] Some bugfixes for the users/groups/roles adminstration,
 JavaDoc

---
 .../usersgroupsroles/EmailFormController.java |   8 +-
 .../usersgroupsroles/GroupDetailsModel.java   |   4 +
 .../usersgroupsroles/GroupFormController.java |  78 +++++++--
 .../GroupMembersRolesController.java          |   4 +-
 .../usersgroupsroles/GroupUserFormEntry.java  |   3 +-
 .../usersgroupsroles/GroupsController.java    |   3 +
 .../usersgroupsroles/RoleDetailsModel.java    |   7 +-
 .../usersgroupsroles/RoleFormController.java  |  84 +++++++--
 .../RoleMembersController.java                |   5 +-
 .../usersgroupsroles/RolePartyFormEntry.java  |   3 +-
 .../usersgroupsroles/RolePartyMembership.java |   3 +-
 .../usersgroupsroles/RolePermission.java      |   3 +-
 .../usersgroupsroles/RolesController.java     |   3 +
 .../usersgroupsroles/UserDetailsModel.java    |  24 ++-
 .../usersgroupsroles/UserFormController.java  | 162 ++++++++++++++----
 .../UserGroupsRolesController.java            |   5 +-
 .../UsersGroupsRolesController.java           |   2 +-
 .../UsersGroupsRolesPage.java                 |   2 +
 .../admin/users-groups-roles/group-form.xhtml |   2 +
 .../admin/users-groups-roles/role-form.xhtml  |   2 +
 .../admin/users-groups-roles/user-form.xhtml  |   5 +
 .../org/libreccm/ui/AdminBundle.properties    |   7 +
 .../org/libreccm/ui/AdminBundle_de.properties |   7 +
 23 files changed, 346 insertions(+), 80 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
index b0868fb54..1aec4519c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/EmailFormController.java
@@ -44,7 +44,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
- * Controller managing the post request from the email edit form.
+ * Controller managing the post requests from the email edit form.
  *
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@@ -59,8 +59,6 @@ public class EmailFormController {
     @Inject
     private AdminMessages adminMessages;
 
-//    @Inject
-//    private BindingResult bindingResult;
     @Inject
     private EmailFormModel emailFormModel;
 
@@ -76,7 +74,7 @@ public class EmailFormController {
     @Inject
     private UserRepository userRepository;
 
-    // MVC does not work with Krazo 1.1.0-M1
+    // MvcBinding does not work with Krazo 1.1.0-M1
 //    @MvcBinding 
     @FormParam("address")
 //    @NotBlank
@@ -121,7 +119,7 @@ public class EmailFormController {
         if (result.isPresent()) {
             final User user = result.get();
 
-            // MVC Binding does not work with Krazo 1.1.0-M1
+            // MvcBinding does not work with Krazo 1.1.0-M1
 //            if (bindingResult.isFailed()) {
 //                models.put("errors", bindingResult.getAllMessages());
 //              emailFormModel.setUserIdentifier(userIdentifierParam);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java
index b2831bb87..ba2255ae9 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupDetailsModel.java
@@ -88,6 +88,10 @@ public class GroupDetailsModel {
     public String getGroupName() {
         return groupName;
     }
+    
+    public void setGroupName(final String groupName) {
+        this.groupName = groupName;
+    }
 
     public List<GroupUserMembership> getMembers() {
         return Collections.unmodifiableList(members);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
index 22784c16b..90297e926 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupFormController.java
@@ -27,24 +27,26 @@ import org.libreccm.security.GroupRepository;
 import org.libreccm.security.RequiresPrivilege;
 import org.libreccm.ui.admin.AdminMessages;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
-import javax.mvc.binding.BindingResult;
-import javax.mvc.binding.MvcBinding;
 import javax.transaction.Transactional;
-import javax.validation.constraints.NotBlank;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
- *
+ * Controller for processing the POST requests from the group form. Depending
+ * on the value returned by {@link GroupDetailsModel#isNewGroup()} a new group
+ * is created or an existing group is updated.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Controller
@@ -54,10 +56,13 @@ public class GroupFormController {
 
     @Inject
     private AdminMessages adminMessages;
-
+    
     @Inject
-    private BindingResult bindingResult;
+    private GroupDetailsModel groupDetailsModel;
 
+    // MvcBinding does not work with Krazo 1.1.0-M1
+//    @Inject
+//    private BindingResult bindingResult;
     @Inject
     private IdentifierParser identifierParser;
 
@@ -67,9 +72,10 @@ public class GroupFormController {
     @Inject
     private GroupRepository groupRepository;
 
-    @MvcBinding
+    // MvcBinding does not work with Krazo 1.1.0-M1
+//    @MvcBinding
     @FormParam("groupName")
-    @NotBlank
+//    @NotBlank
     private String groupName;
 
     @POST
@@ -78,8 +84,29 @@ public class GroupFormController {
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
     public String createGroup() {
-        if (bindingResult.isFailed()) {
-            models.put("errors", bindingResult.getAllMessages());
+        // MvcBinding does not work with Krazo 1.1.0-M1
+//        if (bindingResult.isFailed()) {
+//            models.put("errors", bindingResult.getAllMessages());
+//            return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
+//        }
+        final List<String> errors = new ArrayList<>();
+        if (groupName == null || groupName.matches("\\s*")) {
+            errors.add(
+                adminMessages.get(
+                    "usersgroupsroles.groups.form.errors.name_not_empty"
+                )
+            );
+        }
+        if (!groupName.matches("[a-zA-Z0-9_-]*")) {
+            errors.add(
+                adminMessages.get(
+                    "usersgroupsroles.groups.form.errors.name_invalid"
+                )
+            );
+        }
+        if (!errors.isEmpty()) {
+            models.put("errors", errors);
+            groupDetailsModel.setGroupName(groupName);
             return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
         }
 
@@ -98,10 +125,6 @@ public class GroupFormController {
     public String updateGroup(
         @PathParam("groupIdentifier") final String groupIdentifierParam
     ) {
-        if (bindingResult.isFailed()) {
-            models.put("errors", bindingResult.getAllMessages());
-            return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
-        }
 
         final Identifier identifier = identifierParser.parseIdentifier(
             groupIdentifierParam
@@ -123,6 +146,33 @@ public class GroupFormController {
 
         if (result.isPresent()) {
             final Group group = result.get();
+
+            // MvcBinding does not work with Krazo 1.1.0-M1
+//        if (bindingResult.isFailed()) {
+//            models.put("errors", bindingResult.getAllMessages());
+//            return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
+//        }
+            final List<String> errors = new ArrayList<>();
+            if (groupName == null || groupName.matches("\\s*")) {
+                errors.add(
+                    adminMessages.get(
+                        "usersgroupsroles.groups.form.errors.name_not_empty"
+                    )
+                );
+            }
+            if (!groupName.matches("[a-zA-Z_-]*")) {
+                errors.add(
+                    adminMessages.get(
+                        "usersgroupsroles.groups.form.errors.name_invalid"
+                    )
+                );
+            }
+            if (!errors.isEmpty()) {
+                models.put("errors", errors);
+                groupDetailsModel.setGroup(group);
+                return "org/libreccm/ui/admin/users-groups-roles/group-form.xhtml";
+            }
+
             group.setName(groupName);
 
             groupRepository.save(group);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java
index 80a899071..a7bd8978c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupMembersRolesController.java
@@ -49,7 +49,9 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
- *
+ * Controller for adding members to a group or removing members from a group
+ * based on the selections in the member form (dialog in group-details).
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Controller
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java
index d56e71d83..24b051d9f 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupUserFormEntry.java
@@ -19,7 +19,8 @@
 package org.libreccm.ui.admin.usersgroupsroles;
 
 /**
- *
+ * Model of an entry in the form for managing the members of group.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class GroupUserFormEntry {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
index 69147e572..4f21c91d6 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/GroupsController.java
@@ -49,6 +49,9 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
+ * Primary controller for managing groups. Retrieves data for the views and
+ * shows them. Processing of POST requests from the forms is done in other
+ * controllers.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleDetailsModel.java
index a22f07c45..2b822ed1d 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleDetailsModel.java
@@ -36,7 +36,8 @@ import javax.inject.Named;
 import javax.transaction.Transactional;
 
 /**
- *
+ * Provides the data for the details view of a role and the role edit form.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
@@ -81,6 +82,10 @@ public class RoleDetailsModel {
     public String getRoleName() {
         return roleName;
     }
+    
+    public void setRoleName(final String roleName) {
+        this.roleName = roleName;
+    }
 
     public List<RolePartyMembership> getMembers() {
         return Collections.unmodifiableList(members);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleFormController.java
index 80df106d9..6f9abd5fe 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleFormController.java
@@ -27,24 +27,26 @@ import org.libreccm.security.Role;
 import org.libreccm.security.RoleRepository;
 import org.libreccm.ui.admin.AdminMessages;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
-import javax.mvc.binding.BindingResult;
-import javax.mvc.binding.MvcBinding;
 import javax.transaction.Transactional;
-import javax.validation.constraints.NotBlank;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
- *
+ * Processes the POST requests from the role edit form. Depending on the value
+ * returned by {@link RoleDetailsModel#isNewRole()} a new role is created or
+ * an existing role updated.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Controller
@@ -55,21 +57,25 @@ public class RoleFormController {
     @Inject
     private AdminMessages adminMessages;
 
-    @Inject
-    private BindingResult bindingResult;
-
+    // MvcBinding does not work with Krazo 1.1.0-M1
+//    @Inject
+//    private BindingResult bindingResult;
     @Inject
     private IdentifierParser identifierParser;
 
     @Inject
     private Models models;
 
+    @Inject
+    private RoleDetailsModel roleDetailsModel;
+
     @Inject
     private RoleRepository roleRepository;
 
-    @MvcBinding
+    // MvcBinding does not work with Krazo 1.1.0-M1
+//    @MvcBinding
     @FormParam("roleName")
-    @NotBlank
+//    @NotBlank
     private String roleName;
 
     @POST
@@ -78,8 +84,29 @@ public class RoleFormController {
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
     public String createRole() {
-        if (bindingResult.isFailed()) {
-            models.put("errors", bindingResult.getAllMessages());
+        // MvcBinding does not work with Krazo 1.1.0-M1
+//        if (bindingResult.isFailed()) {
+//            models.put("errors", bindingResult.getAllMessages());
+//            return "org/libreccm/ui/admin/users-groups-roles/role-form.xhtml";
+//        }
+        final List<String> errors = new ArrayList<>();
+        if (roleName == null || roleName.matches("\\s*")) {
+            errors.add(
+                adminMessages.get(
+                    "usersgroupsroles.roles.form.errors.name_not_empty"
+                )
+            );
+        }
+        if (!roleName.matches("[a-zA-Z0-9_-]")) {
+            errors.add(
+                adminMessages.get(
+                    "usersgroupsroles.roles.form.errors.name_invalid"
+                )
+            );
+        }
+        if (!errors.isEmpty()) {
+            models.put("errors", errors);
+            roleDetailsModel.setRoleName(roleName);
             return "org/libreccm/ui/admin/users-groups-roles/role-form.xhtml";
         }
 
@@ -98,11 +125,6 @@ public class RoleFormController {
     public String updateRole(
         @PathParam("roleIdentifier") final String roleIdentifierParam
     ) {
-        if (bindingResult.isFailed()) {
-            models.put("errors", bindingResult.getAllMessages());
-            return "org/libreccm/ui/admin/users-groups-roles/role-form.xhtml";
-        }
-
         final Identifier identifier = identifierParser.parseIdentifier(
             roleIdentifierParam
         );
@@ -120,11 +142,37 @@ public class RoleFormController {
                 result = roleRepository.findByName(identifier.getIdentifier());
                 break;
         }
-        
+
         if (result.isPresent()) {
             final Role role = result.get();
-            role.setName(roleName);
+
+            // MvcBinding does not work with Krazo 1.1.0-M1
+//        if (bindingResult.isFailed()) {
+//            models.put("errors", bindingResult.getAllMessages());
+//            return "org/libreccm/ui/admin/users-groups-roles/role-form.xhtml";
+//        }
+            final List<String> errors = new ArrayList<>();
+            if (roleName == null || roleName.matches("\\s*")) {
+                errors.add(
+                    adminMessages.get(
+                        "usersgroupsroles.roles.form.errors.name_not_empty"
+                    )
+                );
+            }
+            if (!roleName.matches("[a-zA-Z0-9_-]")) {
+                errors.add(
+                    adminMessages.get(
+                        "usersgroupsroles.roles.form.errors.name_invalid"
+                    )
+                );
+            }
+            if (!errors.isEmpty()) {
+                models.put("errors", errors);
+                roleDetailsModel.setRole(role);
+                return "org/libreccm/ui/admin/users-groups-roles/role-form.xhtml";
+            }
             
+            role.setName(roleName);
             return "redirect:users-groups-roles/roles";
         } else {
             models.put(
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleMembersController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleMembersController.java
index 8bf005a29..340caa9b9 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleMembersController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RoleMembersController.java
@@ -46,7 +46,10 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
- *
+ * Controller for adding members to a role and removing members from a role 
+ * depending on the selections in the role members management form (dialog in
+ * role details).
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Controller
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyFormEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyFormEntry.java
index cab35dc5e..0b1c2acf2 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyFormEntry.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyFormEntry.java
@@ -19,7 +19,8 @@
 package org.libreccm.ui.admin.usersgroupsroles;
 
 /**
- *
+ * Model for an entry in the role members form.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class RolePartyFormEntry {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyMembership.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyMembership.java
index c5b272468..e82ab66fc 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyMembership.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePartyMembership.java
@@ -23,7 +23,8 @@ import org.libreccm.security.Party;
 import java.util.Objects;
 
 /**
- *
+ * Model friendly representation of a member of a role.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class RolePartyMembership implements Comparable<RolePartyMembership>{
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePermission.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePermission.java
index c17199a7f..0c34c5a0e 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePermission.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolePermission.java
@@ -23,7 +23,8 @@ import org.libreccm.security.Permission;
 import java.util.Objects;
 
 /**
- *
+ * Model friendly representation of a permission granted to a role.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class RolePermission implements Comparable<RolePermission> {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
index f71b5080e..b03aac08c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/RolesController.java
@@ -45,6 +45,9 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
+ * Primary controller for managing roles. Retrieves the data for the views for
+ * manageing roles. POST requests from the forms a processed by other
+ * controllers.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
index 78d052288..5a9b208d3 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserDetailsModel.java
@@ -134,19 +134,31 @@ public class UserDetailsModel {
     public String getName() {
         return name;
     }
+    
+    public void setName(final String name) {
+        this.name = name;
+    }
 
     public String getGivenName() {
         return givenName;
     }
+    
+    public void setGivenName(final String givenName) {
+        this.givenName = givenName;
+    }
 
     public String getFamilyName() {
         return familyName;
     }
+    
+    public  void setFamilyName(final String familyName) {
+        this.familyName = familyName;
+    }
 
     public EmailAddress getPrimaryEmailAddress() {
         return primaryEmailAddress;
     }
-
+    
     public List<EmailAddress> getEmailAddresses() {
         return Collections.unmodifiableList(emailAddresses);
     }
@@ -154,10 +166,20 @@ public class UserDetailsModel {
     public boolean isBanned() {
         return banned;
     }
+    
+    public void setBanned(final boolean banned) {
+        this.banned = banned;
+    }
 
     public boolean isPasswordResetRequired() {
         return passwordResetRequired;
     }
+    
+    public void setPasswordResetRequired(
+        final boolean passwordResetRequired
+    ) {
+        this.passwordResetRequired = passwordResetRequired;
+    }
 
     public List<UserGroupMembership> getGroupMemberships() {
         return Collections.unmodifiableList(groupMemberships);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
index 57cbb9968..d7ffba95b 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserFormController.java
@@ -28,8 +28,9 @@ import org.libreccm.security.UserManager;
 import org.libreccm.security.UserRepository;
 import org.libreccm.ui.admin.AdminMessages;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Map;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -37,12 +38,7 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
-import javax.mvc.MvcContext;
-import javax.mvc.binding.BindingResult;
-import javax.mvc.binding.MvcBinding;
 import javax.transaction.Transactional;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -61,9 +57,9 @@ public class UserFormController {
     @Inject
     private AdminMessages adminMessages;
 
-    @Inject
-    private BindingResult bindingResult;
-
+    // MvcBinding does not work with Krazo 1.1.0-M1
+//    @Inject
+//    private BindingResult bindingResult;
     @Inject
     private IdentifierParser identifierParser;
 
@@ -71,7 +67,7 @@ public class UserFormController {
     private Models models;
 
     @Inject
-    private MvcContext mvc;
+    private UserDetailsModel userDetailsModel;
 
     @Inject
     private UserManager userManager;
@@ -79,9 +75,10 @@ public class UserFormController {
     @Inject
     private UserRepository userRepository;
 
-    @MvcBinding
+    // MvcBinding does not work with Krazo 1.1.0-M1
+//    @MvcBinding
     @FormParam("userName")
-    @NotBlank
+//    @NotBlank
     private String userName;
 
     @FormParam("givenName")
@@ -90,10 +87,11 @@ public class UserFormController {
     @FormParam("familyName")
     private String familyName;
 
-    @MvcBinding
+    // MvcBinding does not work with Krazo 1.1.0-M1
+//    @MvcBinding
     @FormParam("primaryEmailAddress")
-    @NotBlank
-    @Email
+//    @NotBlank
+//    @Email
     private String primaryEmailAddress;
 
     @FormParam("primaryEmailAddressBouncing")
@@ -120,24 +118,75 @@ public class UserFormController {
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
     public String createUser() {
-        if (bindingResult.isFailed()) {
-            models.put("errors", bindingResult.getAllMessages());
-            return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+        // MvcBinding does not work with Krazo 1.1.0-M1
+//        if (bindingResult.isFailed()) {
+//            models.put("errors", bindingResult.getAllMessages());
+//            return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+//        }
+        final List<String> errors = new ArrayList<>();
+        if (userName == null || userName.matches("\\s*")) {
+            errors.add(
+                adminMessages.get(
+                    "usersgroupsroles.users.form.errors.username.empty"
+                )
+            );
+        }
+        if (!userName.matches("[a-zA-Z0-9_-]*")) {
+            errors.add(
+                adminMessages.get(
+                    "usersgroupsroles.users.form.errors.username.invalid"
+                )
+            );
+        }
+
+        if (primaryEmailAddress == null || primaryEmailAddress.matches("\\s*")) {
+            errors.add(
+                adminMessages.get(
+                    "usersgroupsroles.users.form.errors.primary_email.empty"
+                )
+            );
+        }
+        if (!primaryEmailAddress.matches(
+            "^[a-zA-Z0-9\\._-]*@[a-zA-Z0-9\\._-]*$"
+        )) {
+            errors.add(
+                adminMessages.get(
+                    "usersgroupsroles.users.form.errors.primary_email.invalid"
+                )
+            );
         }
 
         if (password == null || password.isEmpty()) {
-            models.put("errors", Arrays.asList(
-                       adminMessages.get(
-                           "usersgroupsroles.users.new.errors.password.empty")
-                   ));
-            return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+            errors.add(
+                adminMessages.get(
+                    "usersgroupsroles.users.new.errors.password.empty"
+                )
+            );
         }
 
         if (!Objects.equals(password, passwordConfirmation)) {
-            models.put("errors", Arrays.asList(
-                       adminMessages.get(
-                           "usersgroupsroles.users.new.errors.password.no_match")
-                   ));
+            errors.add(
+                adminMessages.get(
+                    "usersgroupsroles.users.new.errors.password.no_match"
+                )
+            );
+        }
+        if (!errors.isEmpty()) {
+            models.put("errors", errors);
+            userDetailsModel.setName(userName);
+            userDetailsModel.setGivenName(givenName);
+            userDetailsModel.setFamilyName(familyName);
+            userDetailsModel
+                .getPrimaryEmailAddress()
+                .setAddress(primaryEmailAddress);
+            userDetailsModel
+                .getPrimaryEmailAddress()
+                .setBouncing(primaryEmailAddressBouncing);
+            userDetailsModel
+                .getPrimaryEmailAddress()
+                .setVerified(primaryEmailAddressVerified);
+            userDetailsModel.setBanned(banned);
+            userDetailsModel.setPasswordResetRequired(passwordResetRequired);
             return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
         }
 
@@ -156,11 +205,6 @@ public class UserFormController {
     public String updateUser(
         @PathParam("userIdentifier") final String userIdentifierParam
     ) {
-        if (bindingResult.isFailed()) {
-            models.put("errors", bindingResult.getAllMessages());
-            return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
-        }
-
         final Identifier identifier = identifierParser.parseIdentifier(
             userIdentifierParam
         );
@@ -183,6 +227,60 @@ public class UserFormController {
 
         if (result.isPresent()) {
             final User user = result.get();
+
+            // MvcBinding does not work with Krazo 1.1.0-M1
+//          if (bindingResult.isFailed()) {
+//              models.put("errors", bindingResult.getAllMessages());
+//              return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+//          }
+            final List<String> errors = new ArrayList<>();
+            if (userName == null || userName.matches("\\s*")) {
+                errors.add(
+                    adminMessages.get(
+                        "usersgroupsroles.users.form.errors.username.empty"
+                    )
+                );
+            }
+            if (!userName.matches("[a-zA-Z0-9_-]*")) {
+                errors.add(
+                    adminMessages.get(
+                        "usersgroupsroles.users.form.errors.username.invalid"
+                    )
+                );
+            }
+
+            if (primaryEmailAddress == null || primaryEmailAddress.matches(
+                "\\s*")) {
+                errors.add(
+                    adminMessages.get(
+                        "usersgroupsroles.users.form.errors.primary_email.empty"
+                    )
+                );
+            }
+            if (!primaryEmailAddress.matches(
+                "^[a-zA-Z0-9\\._-]*@[a-zA-Z0-9\\._-]*$"
+            )) {
+                errors.add(
+                    adminMessages.get(
+                        "usersgroupsroles.users.form.errors.primary_email.invalid"
+                    )
+                );
+            }
+
+            if (password != null) {
+                if (!Objects.equals(password, passwordConfirmation)) {
+                    errors.add(
+                        adminMessages.get(
+                            "usersgroupsroles.users.new.errors.password.no_match"
+                        )
+                    );
+                }
+            }
+            if (!errors.isEmpty()) {
+                userDetailsModel.setUser(user);
+                return "org/libreccm/ui/admin/users-groups-roles/user-form.xhtml";
+            }
+
             user.setUuid(userName);
             user.setGivenName(givenName);
             user.setFamilyName(familyName);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsRolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsRolesController.java
index 9afa33c92..bf54ce05c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsRolesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UserGroupsRolesController.java
@@ -35,7 +35,6 @@ import org.libreccm.ui.admin.AdminMessages;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -50,7 +49,9 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
- *
+ * Adds and removes a user from groups and roles depending on the selections
+ * in the corresponding dialogs in the user details view.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Controller
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
index 70951149a..c724cb047 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesController.java
@@ -28,7 +28,7 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
 /**
- * 
+ * Controller for the overview page of the users/groups/roles admin section.
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
index 2a2c833d5..0b3e39d9c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersGroupsRolesPage.java
@@ -27,6 +27,8 @@ import java.util.Set;
 import javax.enterprise.context.ApplicationScoped;
 
 /**
+ * {@link AdminPage} implementation for the users/groups/roles section of the
+ * AdminUI.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
index 8dbdfcfc7..389b7ec73 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/group-form.xhtml
@@ -47,6 +47,8 @@
                            class="form-control" 
                            id="groupname" 
                            name="groupName" 
+                           pattern="[a-zA-Z0-9_-]*"
+                           required="required"
                            value="#{GroupDetailsModel.groupName}"
                            type="text" />
                     <small class="form-text text-muted"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml
index 2fe7741c2..018da950f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/role-form.xhtml
@@ -47,6 +47,8 @@
                            class="form-control" 
                            id="rolename" 
                            name="roleName" 
+                           pattern="[a-zA-Z0-9_-]*"
+                           required="required"
                            value="#{RoleDetailsModel.roleName}"
                            type="text" />
                     <small class="form-text text-muted"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
index ceb480028..23ebc7a44 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
@@ -47,6 +47,8 @@
                            class="form-control" 
                            id="username" 
                            name="userName" 
+                           pattern="[a-zA-Z0-9_-]*"
+                           required="required"
                            value="#{UserDetailsModel.name}"
                            type="text" />
                     <small class="form-text text-muted"
@@ -92,6 +94,7 @@
                            class="form-control" 
                            id="primary-email-address" 
                            name="primaryEmailAddress" 
+                           required="required"
                            value="#{UserDetailsModel.primaryEmailAddress.address}"
                            type="email" />
                     <small class="form-text text-muted"
@@ -129,6 +132,7 @@
                                class="form-control" 
                                id="password" 
                                name="password" 
+                               required="required"
                                type="password" />
                         <small class="form-text text-muted"
                                id="password-help">
@@ -143,6 +147,7 @@
                                class="form-control" 
                                id="password-confirmation" 
                                name="passwordConfirmation" 
+                               required="required"
                                type="password" />
                         <small class="form-text text-muted"
                                id="password-help">
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 0597f2db6..2503fdeb8 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -199,3 +199,10 @@ usersgroupsroles.roles.delete.confirm.message=Are you sure to delete role {0}?
 usersgroupsroles.roles.delete.confirm.cancel=Cancel
 usersgroupsroles.roles.delete.confirm.yes=Delete role
 usersgroupsroles.roles.role_details.uuid=UUID
+usersgroupsroles.groups.form.errors.name_not_empty=The name of a group can't be empty
+usersgroupsroles.groups.form.errors.name_invalid=The name of a group may only contain the characters a to z, A to Z, 0 to 9, the dash (-), and the underscore (_).
+usersgroupsroles.roles.form.errors.name_not_empty=The name of a role can't be empty
+usersgroupsroles.users.form.errors.username.empty=The username of a user can't be empty
+usersgroupsroles.users.form.errors.username.invalid=The username may only contain the characters a to z, A to Z, 0 to 9, the dash (-) and the underscore (_)
+usersgroupsroles.users.form.errors.primary_email.empty=The primary email address of a user can't b be empty
+usersgroupsroles.users.form.errors.primary_email.invalid=The primary email address of a user must be a valid email address
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 4c184f715..c856e17f0 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -199,3 +199,10 @@ usersgroupsroles.roles.delete.confirm.message=Sind Sie sicher, dass Sie die Roll
 usersgroupsroles.roles.delete.confirm.cancel=Abbrechen
 usersgroupsroles.roles.delete.confirm.yes=Rolle l\u00f6schen
 usersgroupsroles.roles.role_details.uuid=UUID
+usersgroupsroles.groups.form.errors.name_not_empty=Der Name einer Gruppe darf nicht leer sein
+usersgroupsroles.groups.form.errors.name_invalid=Der Name einer Gruppe darf nur die Zeichen a bis z, A bis Z, 0 bis 9, den Bindestrich (-) und den Unterstrich (_) enthalten
+usersgroupsroles.roles.form.errors.name_not_empty=Der Name einer Rolle darf nicht leer sein
+usersgroupsroles.users.form.errors.username.empty=Der Benutzername eines Benutzers darf nicht leer sein
+usersgroupsroles.users.form.errors.username.invalid=Der Benutzername eines Benutzers darf nur die Zeichen a bis z, A bis Z, 0 bis 9, den Bindestrich (-) und den Unterstrich (_) enthalten
+usersgroupsroles.users.form.errors.primary_email.empty=Die prim\u00e4re E-Mail-Addresse eines Benutzers darf nicht leer sein.
+usersgroupsroles.users.form.errors.primary_email.invalid=Die prim\u00e4re E-Mail-Addresse eines Benutzers muss eine valide E-Mail-Addresse sein

From 48c2faff70c26801458076fe54da45e766a32449 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Fri, 23 Oct 2020 18:29:17 +0200
Subject: [PATCH 26/93] Configurations list

---
 .../configuration/ConfigurationInfo.java      | 10 ++-
 .../ConfigurationController.java              | 44 +++++++++++
 .../ConfigurationTableEntry.java              | 77 +++++++++++++++++++
 .../org/libreccm/ui/admin/configuration.xhtml | 51 ++++++++++--
 .../org/libreccm/ui/AdminBundle.properties    |  2 +
 .../org/libreccm/ui/AdminBundle_de.properties |  2 +
 6 files changed, 180 insertions(+), 6 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationTableEntry.java

diff --git a/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationInfo.java b/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationInfo.java
index 1cd59e094..e7390b405 100644
--- a/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationInfo.java
+++ b/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationInfo.java
@@ -21,7 +21,15 @@ package org.libreccm.configuration;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.NavigableMap;
+import java.util.Objects;
+import java.util.ResourceBundle;
+import java.util.TreeMap;
+
+
 
 /**
  * Describes a configuration. Useful for generating user interfaces.
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
index e36f7fdc7..5c52afa0e 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
@@ -18,12 +18,22 @@
  */
 package org.libreccm.ui.admin.configuration;
 
+import org.libreccm.configuration.ConfigurationInfo;
+import org.libreccm.configuration.ConfigurationManager;
 import org.libreccm.core.CoreConstants;
+import org.libreccm.l10n.GlobalizationHelper;
+import org.libreccm.l10n.LocalizedTextsUtil;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.mvc.Models;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
@@ -35,12 +45,46 @@ import javax.ws.rs.Path;
 @Controller
 @Path("/configuration")
 public class ConfigurationController {
+
+    @Inject
+    private ConfigurationManager confManager;
+
+    @Inject
+    private GlobalizationHelper globalizationHelper;
     
+    @Inject
+    private Models models;
+
     @GET
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String getSettings() {
+        final List<ConfigurationTableEntry> configurationClasses = confManager
+            .findAllConfigurations()
+            .stream()
+            .map(confManager::getConfigurationInfo)
+            .map(this::buildTableEntry)
+            .sorted()
+            .collect(Collectors.toList());
+
+        models.put("configurationClasses", configurationClasses);
+        
         return "org/libreccm/ui/admin/configuration.xhtml";
     }
+
+    private ConfigurationTableEntry buildTableEntry(
+        final ConfigurationInfo confInfo
+    ) {
+        Objects.requireNonNull(confInfo);
+        final ConfigurationTableEntry entry = new ConfigurationTableEntry();
+        entry.setName(confInfo.getName());
+        final LocalizedTextsUtil util = globalizationHelper
+            .getLocalizedTextsUtil(confInfo.getDescBundle());
+        entry.setTitle(util.getText(confInfo.getTitleKey()));
+        entry.setDescription(util.getText(confInfo.getDescKey()));
+        
+        return entry;
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationTableEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationTableEntry.java
new file mode 100644
index 000000000..9879542a5
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationTableEntry.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.configuration;
+
+import java.util.Objects;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class ConfigurationTableEntry
+    implements Comparable<ConfigurationTableEntry> {
+
+    private String name;
+
+    private String title;
+
+    private String description;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(final String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(final String description) {
+        this.description = description;
+    }
+
+    @Override
+    public int compareTo(final ConfigurationTableEntry other) {
+        int result = Objects.compare(
+            title,
+            Objects.requireNonNull(other).getTitle(),
+            String::compareTo
+        );
+        if (result == 0) {
+            result = Objects.compare(
+                name,
+                Objects.requireNonNull(other).getName(),
+                String::compareTo
+            );
+        }
+        return result;
+    }
+
+}
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
index 2b3f210b2..fbf67bb94 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
@@ -4,22 +4,63 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
-        
+
         <ui:param name="activePage" value="configuration" />
         <ui:param name="title" value="#{AdminMessages['configuration.label']}" />
-    
+
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item active">
                 #{AdminMessages['configuration.label']}
             </li>
         </ui:define>
-        
+
         <ui:define name="main">
             <div class="container">
                 <h1>#{AdminMessages['configuration.label']}</h1>
-                <p>Placeholder</p>
+                <c:forEach items="#{configurationClasses}" 
+                           var="confClass">
+                    <div class="list-group">
+                        <a href="#" 
+                           class="list-group-item list-group-item-action">
+                            <div class="d-flex w-100 justify-content-between">
+                                <h2 class="mb-1">
+                                    #{confClass.title}
+                                </h2>
+
+                            </div>
+                            <p class="mb-1">
+                                #{confClass.description}
+                            </p>
+                        </a>
+                    </div>
+                </c:forEach>
+                <!--                <table class="table">
+                                    <thead>
+                                        <th scope="col">
+                #{AdminMessages['configuration.table.headings.title']}
+            </th>
+            <th scope="col">
+                #{AdminMessages['configuration.table.headings.description']}
+            </th>
+        </thead>
+        <tbody>
+            <c:forEach items="#{configurationClasses}" 
+                       var="confClass">
+                <tr>
+                    <td>
+                        <a href="#">
+                #{confClass.title}
+            </a>
+        </td>
+        <td>
+                #{confClass.description}
+            </td>
+        </tr>
+    </c:forEach>
+</tbody>-->
+                <!--                </table>-->
             </div>
         </ui:define>
-    
+
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 2503fdeb8..49b2f292f 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -206,3 +206,5 @@ usersgroupsroles.users.form.errors.username.empty=The username of a user can't b
 usersgroupsroles.users.form.errors.username.invalid=The username may only contain the characters a to z, A to Z, 0 to 9, the dash (-) and the underscore (_)
 usersgroupsroles.users.form.errors.primary_email.empty=The primary email address of a user can't b be empty
 usersgroupsroles.users.form.errors.primary_email.invalid=The primary email address of a user must be a valid email address
+configuration.table.headings.title=Configuration
+configuration.table.headings.description=Description
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index c856e17f0..97c53c52b 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -206,3 +206,5 @@ usersgroupsroles.users.form.errors.username.empty=Der Benutzername eines Benutze
 usersgroupsroles.users.form.errors.username.invalid=Der Benutzername eines Benutzers darf nur die Zeichen a bis z, A bis Z, 0 bis 9, den Bindestrich (-) und den Unterstrich (_) enthalten
 usersgroupsroles.users.form.errors.primary_email.empty=Die prim\u00e4re E-Mail-Addresse eines Benutzers darf nicht leer sein.
 usersgroupsroles.users.form.errors.primary_email.invalid=Die prim\u00e4re E-Mail-Addresse eines Benutzers muss eine valide E-Mail-Addresse sein
+configuration.table.headings.title=Konfiguration
+configuration.table.headings.description=Beschreibung

From d6ba57414ceb54082903ed19b8c9bca954acd31c Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Fri, 23 Oct 2020 21:38:18 +0200
Subject: [PATCH 27/93] UI for managing settings

---
 .../configuration/ConfigurationPage.java      |   1 +
 .../configuration/SettingsController.java     | 102 +++++++++++++++++
 .../configuration/SettingsTableEntry.java     | 106 ++++++++++++++++++
 3 files changed, 209 insertions(+)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsTableEntry.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
index d9ebcb039..1a0f38922 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
@@ -36,6 +36,7 @@ public class ConfigurationPage implements AdminPage {
     public Set<Class<?>> getControllerClasses() {
         final Set<Class<?>> classes = new HashSet<>();
         classes.add(ConfigurationController.class);
+        classes.add(SettingsController.class);
         return classes;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
new file mode 100644
index 000000000..e59ee180f
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.configuration;
+
+import org.libreccm.configuration.ConfigurationInfo;
+import org.libreccm.configuration.ConfigurationManager;
+import org.libreccm.configuration.SettingInfo;
+import org.libreccm.l10n.GlobalizationHelper;
+import org.libreccm.l10n.LocalizedTextsUtil;
+
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@Controller
+@RequestScoped
+@Path("/configuration/{configurationClass}")
+public class SettingsController {
+    
+    @Inject
+    private ConfigurationManager confManager;
+    
+    @Inject
+    private GlobalizationHelper globalizationHelper;
+    
+    @Inject
+    private Models models;
+    
+    @Path("/")
+    public String showSettings(
+        @PathParam("configurationClass") final String configurationClass
+    ) {
+        final Class<?> confClass;
+        try {
+        confClass = Class.forName(configurationClass);
+        } catch(ClassNotFoundException ex) {
+            models.put("configurationClass", configurationClass);
+            return "org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml";
+        }
+        
+        final Object conf = confManager.findConfiguration(confClass);
+        final ConfigurationInfo confInfo = confManager.getConfigurationInfo(
+            confClass
+        );
+        
+        confInfo
+            .getSettings()
+            .entrySet()
+            .stream()
+            .map(info -> buildSettingsTableEntry(info.getValue(), conf))
+            .sorted()
+            .collect(Collectors.toList());
+        
+        
+        return "org/libreccm/ui/admin/configuration/settings.xhtml";
+    }
+    
+    private SettingsTableEntry buildSettingsTableEntry(
+        final SettingInfo settingInfo, final Object conf
+    ) {
+        Objects.requireNonNull(settingInfo);
+        
+        final LocalizedTextsUtil textsUtil = globalizationHelper
+            .getLocalizedTextsUtil(settingInfo.getDescBundle());
+        
+        final SettingsTableEntry entry = new SettingsTableEntry();
+        entry.setName(settingInfo.getName());
+        entry.setValueType(settingInfo.getValueType());
+        entry.setDefaultValue(settingInfo.getDefaultValue());
+        entry.setLabel(textsUtil.getText(settingInfo.getLabelKey()));
+        entry.setDescription(textsUtil.getText(settingInfo.getDescKey()));
+        
+        return entry;
+    }
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsTableEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsTableEntry.java
new file mode 100644
index 000000000..bf83bb223
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsTableEntry.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.configuration;
+
+import java.util.Objects;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class SettingsTableEntry implements Comparable<SettingsTableEntry> {
+
+    private String name;
+
+    private String valueType;
+
+    private String defaultValue;
+
+    private String value;
+
+    private String label;
+
+    private String description;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public String getValueType() {
+        return valueType;
+    }
+
+    public void setValueType(final String valueType) {
+        this.valueType = valueType;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public void setDefaultValue(final String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(final String label) {
+        this.label = label;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(final String description) {
+        this.description = description;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+    @Override
+    public int compareTo(final SettingsTableEntry other) {
+        int result = Objects.compare(
+            label,
+            Objects.requireNonNull(other).getLabel(),
+            String::compareTo
+        );
+        if (result == 0) {
+            result = Objects.compare(
+                name, 
+                other.getName(), 
+                String::compareTo
+            );
+        }
+        return result;
+    }
+
+}

From f8607c0fb33f9c0aa632253bfb3a69f8d87f8d9c Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 31 Oct 2020 19:23:36 +0100
Subject: [PATCH 28/93] Settings view for configuration

---
 .../ConfigurationController.java              |   2 +-
 .../configuration/SettingsController.java     |  28 ++++-
 .../org/libreccm/ui/admin/configuration.xhtml |  66 -----------
 .../admin/configuration/configuration.xhtml   |  38 ++++++
 .../ui/admin/configuration/settings.xhtml     | 111 ++++++++++++++++++
 .../org/libreccm/ui/AdminBundle.properties    |  10 ++
 .../org/libreccm/ui/AdminBundle_de.properties |  10 ++
 7 files changed, 194 insertions(+), 71 deletions(-)
 delete mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
index 5c52afa0e..a6ab323c2 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
@@ -70,7 +70,7 @@ public class ConfigurationController {
 
         models.put("configurationClasses", configurationClasses);
         
-        return "org/libreccm/ui/admin/configuration.xhtml";
+        return "org/libreccm/ui/admin/configuration/configuration.xhtml";
     }
 
     private ConfigurationTableEntry buildTableEntry(
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
index e59ee180f..c6ff18788 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
@@ -21,9 +21,14 @@ package org.libreccm.ui.admin.configuration;
 import org.libreccm.configuration.ConfigurationInfo;
 import org.libreccm.configuration.ConfigurationManager;
 import org.libreccm.configuration.SettingInfo;
+import org.libreccm.core.CoreConstants;
 import org.libreccm.l10n.GlobalizationHelper;
 import org.libreccm.l10n.LocalizedTextsUtil;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
 
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -31,6 +36,7 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
+import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
@@ -52,7 +58,10 @@ public class SettingsController {
     @Inject
     private Models models;
     
+    @GET
     @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String showSettings(
         @PathParam("configurationClass") final String configurationClass
     ) {
@@ -64,25 +73,36 @@ public class SettingsController {
             return "org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml";
         }
         
-        final Object conf = confManager.findConfiguration(confClass);
         final ConfigurationInfo confInfo = confManager.getConfigurationInfo(
             confClass
         );
         
-        confInfo
+        final LocalizedTextsUtil textUtil = globalizationHelper.getLocalizedTextsUtil(confInfo.getDescBundle());
+        models.put(
+            "confLabel", 
+            textUtil.getText(confInfo.getTitleKey())
+        );
+        models.put(
+            "configurationDesc", 
+            textUtil.getText(confInfo.getDescKey())
+        );
+        
+        final List<SettingsTableEntry> settings = confInfo
             .getSettings()
             .entrySet()
             .stream()
-            .map(info -> buildSettingsTableEntry(info.getValue(), conf))
+            .map(Map.Entry::getValue)
+            .map(this::buildSettingsTableEntry)
             .sorted()
             .collect(Collectors.toList());
         
+        models.put("settings", settings);
         
         return "org/libreccm/ui/admin/configuration/settings.xhtml";
     }
     
     private SettingsTableEntry buildSettingsTableEntry(
-        final SettingInfo settingInfo, final Object conf
+        final SettingInfo settingInfo
     ) {
         Objects.requireNonNull(settingInfo);
         
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
deleted file mode 100644
index fbf67bb94..000000000
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration.xhtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      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/libreccm/ui/admin/ccm-admin.xhtml">
-
-        <ui:param name="activePage" value="configuration" />
-        <ui:param name="title" value="#{AdminMessages['configuration.label']}" />
-
-        <ui:define name="breadcrumb">
-            <li class="breadcrumb-item active">
-                #{AdminMessages['configuration.label']}
-            </li>
-        </ui:define>
-
-        <ui:define name="main">
-            <div class="container">
-                <h1>#{AdminMessages['configuration.label']}</h1>
-                <c:forEach items="#{configurationClasses}" 
-                           var="confClass">
-                    <div class="list-group">
-                        <a href="#" 
-                           class="list-group-item list-group-item-action">
-                            <div class="d-flex w-100 justify-content-between">
-                                <h2 class="mb-1">
-                                    #{confClass.title}
-                                </h2>
-
-                            </div>
-                            <p class="mb-1">
-                                #{confClass.description}
-                            </p>
-                        </a>
-                    </div>
-                </c:forEach>
-                <!--                <table class="table">
-                                    <thead>
-                                        <th scope="col">
-                #{AdminMessages['configuration.table.headings.title']}
-            </th>
-            <th scope="col">
-                #{AdminMessages['configuration.table.headings.description']}
-            </th>
-        </thead>
-        <tbody>
-            <c:forEach items="#{configurationClasses}" 
-                       var="confClass">
-                <tr>
-                    <td>
-                        <a href="#">
-                #{confClass.title}
-            </a>
-        </td>
-        <td>
-                #{confClass.description}
-            </td>
-        </tr>
-    </c:forEach>
-</tbody>-->
-                <!--                </table>-->
-            </div>
-        </ui:define>
-
-    </ui:composition>
-</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration.xhtml
new file mode 100644
index 000000000..cfffb9180
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration.xhtml
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="configuration" />
+        <ui:param name="title" value="#{AdminMessages['configuration.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['configuration.label']}
+            </li>
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['configuration.label']}</h1>
+                <div class="list-group">
+                    <c:forEach items="#{configurationClasses}" 
+                               var="confClass">
+                        <a class="list-group-item list-group-item-action"
+                           href="#{mvc.uri('SettingsController#showSettings', { 'configurationClass': confClass.name })}">
+                            <h2 class="h3 mb-1">
+                                #{confClass.title}
+                            </h2>
+                            <p class="mb-1">
+                                #{confClass.description}
+                            </p>
+                        </a>
+                    </c:forEach>
+                </div>
+            </div>
+        </ui:define>
+
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
new file mode 100644
index 000000000..2a1680169
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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">
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="configuration" />
+        <ui:param name="title" value="#{AdminMessages['configuration.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                #{AdminMessages['configuration.label']}
+            </li>
+            <li class="breadcrumb-item">>
+                #{confLabel}
+            </li>
+            <li class="breadcrumb-item active">>
+                #{AdminMessages['configuration.settings.label']}
+            </li>
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{confLabel}</h1>
+                <p>
+                    #{confDescription}
+                </p>
+                <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th scope="col">
+                                #{AdminMessages['configuration.settings.table.headings.label']}
+                            </th>
+                            <th scope="col">
+                                #{AdminMessages['configuration.settings.table.headings.value']}
+                            </th>
+                            <th scope="col">
+                                #{AdminMessages['configuration.settings.table.headings.defaultValue']}
+                            </th>
+                            <th scope="col" colspan="3">
+                                #{AdminMessages['configuration.settings.table.headings.actions']}
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <c:forEach items="#{settings}" var="setting">
+                            <tr>
+                                <td>#{setting.label}</td>
+                                <td>
+                                    <c:choose>
+                                        <c:when test="#{setting.value == null}">
+                                            <span class="text-muted">#{setting.defaultValue}</span>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <strong>
+                                                #{setting.value}
+                                            </strong>
+                                        </c:otherwise>
+                                    </c:choose>
+                                </td>
+                                <td>#{setting.defaultValue}</td>
+                                <td>
+                                    <button class="btn btn-info" 
+                                            title="#{AdminMessages.getMessage('configuration.settings.table.actions.info.help', [setting.label])}"
+                                            type="button">
+                                         <svg class="bi"
+                                             width="1em"
+                                             height="1em"
+                                             fill="currentColor">
+                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#info-circle" />
+                                         </svg>
+                                        #{AdminMessages['configuration.settings.table.actions.info']}
+                                    </button>
+                                </td>
+                                <td>
+                                    <button class="btn btn-primary" 
+                                            type="button">
+                                        <svg class="bi"
+                                             width="1em"
+                                             height="1em"
+                                             fill="currentColor">
+                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                                        </svg>
+                                        #{AdminMessages['configuration.settings.table.actions.edit']}
+                                    </button>
+                                </td>
+                                <td>
+                                    <button class="btn btn-danger" 
+                                            title="#{AdminMessages.getMessage('configuration.settings.table.actions.reset.help', [setting.label])}"
+                                            type="button">
+                                        <svg class="bi"
+                                             width="1em"
+                                             height="1em"
+                                             fill="currentColor">
+                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                        </svg>
+                                        #{AdminMessages['configuration.settings.table.actions.reset']}
+                                    </button>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </ui:define>
+
+    </ui:composition>
+</html>
+
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 49b2f292f..ee6e5c0b9 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -208,3 +208,13 @@ usersgroupsroles.users.form.errors.primary_email.empty=The primary email address
 usersgroupsroles.users.form.errors.primary_email.invalid=The primary email address of a user must be a valid email address
 configuration.table.headings.title=Configuration
 configuration.table.headings.description=Description
+configuration.settings.label=Settings
+configuration.settings.table.headings.label=Setting
+configuration.settings.table.headings.value=Current value
+configuration.settings.table.headings.defaultValue=Default Value
+configuration.settings.table.headings.actions=Aktionen
+configuration.settings.table.actions.info=Info
+configuration.settings.table.actions.info.help=Show description of setting {0}
+configuration.settings.table.actions.edit=Edit
+configuration.settings.table.actions.reset.help=Reset setting {0} to default value {1}
+configuration.settings.table.actions.reset=Reset
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 97c53c52b..ee0018fde 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -208,3 +208,13 @@ usersgroupsroles.users.form.errors.primary_email.empty=Die prim\u00e4re E-Mail-A
 usersgroupsroles.users.form.errors.primary_email.invalid=Die prim\u00e4re E-Mail-Addresse eines Benutzers muss eine valide E-Mail-Addresse sein
 configuration.table.headings.title=Konfiguration
 configuration.table.headings.description=Beschreibung
+configuration.settings.label=Einstellungen
+configuration.settings.table.headings.label=Einstellung
+configuration.settings.table.headings.value=Aktueller Wert
+configuration.settings.table.headings.defaultValue=Standardwert
+configuration.settings.table.headings.actions=Aktionen
+configuration.settings.table.actions.info=Info
+configuration.settings.table.actions.info.help=Beschreibung f\u00fcr Einstellung {0} anzeigen
+configuration.settings.table.actions.edit=Bearbeiten
+configuration.settings.table.actions.reset.help=Einstellung {0} auf Standardwert {1} zur\u00fccksetzen
+configuration.settings.table.actions.reset=Zur\u00fccksetzen

From 75a0ff7fbcdd6c2fd260e7a795b0dd987ba526ac Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 1 Nov 2020 13:00:54 +0100
Subject: [PATCH 29/93] Labels and descriptions for configuration settings

---
 .../java/org/arsdigita/cms/CMSConfig.java     | 322 ++++++++++++++----
 .../com/arsdigita/cms/CMSConfig.properties    | 126 +++++++
 .../com/arsdigita/cms/CMSConfig_de.properties | 126 +++++++
 .../java/com/arsdigita/bebop/BebopConfig.java |  60 +++-
 .../dispatcher/DispatcherConfig.java          |  26 +-
 .../configuration/SettingManager.java         |   2 +-
 .../ui/admin/configuration/settings.xhtml     |  10 +-
 .../arsdigita/bebop/BebopConfig.properties    |  41 +++
 .../arsdigita/bebop/BebopConfig_de.properties |  41 +++
 .../dispatcher/DispatcherConfig.properties    |  27 ++
 .../dispatcher/DispatcherConfig_de.properties |  27 ++
 .../GlobalizationConfigDescription.properties |   2 +-
 .../kernel/KernelConfigDescription.properties |  20 +-
 .../KernelConfigDescription_de.properties     |  35 ++
 14 files changed, 771 insertions(+), 94 deletions(-)
 create mode 100644 ccm-cms/src/main/resources/com/arsdigita/cms/CMSConfig.properties
 create mode 100644 ccm-cms/src/main/resources/com/arsdigita/cms/CMSConfig_de.properties
 create mode 100644 ccm-core/src/main/resources/com/arsdigita/bebop/BebopConfig.properties
 create mode 100644 ccm-core/src/main/resources/com/arsdigita/bebop/BebopConfig_de.properties
 create mode 100644 ccm-core/src/main/resources/com/arsdigita/dispatcher/DispatcherConfig.properties
 create mode 100644 ccm-core/src/main/resources/com/arsdigita/dispatcher/DispatcherConfig_de.properties
 create mode 100644 ccm-core/src/main/resources/com/arsdigita/kernel/KernelConfigDescription_de.properties

diff --git a/ccm-cms/src/main/java/org/arsdigita/cms/CMSConfig.java b/ccm-cms/src/main/java/org/arsdigita/cms/CMSConfig.java
index 19d8846d7..39e7ffbe0 100644
--- a/ccm-cms/src/main/java/org/arsdigita/cms/CMSConfig.java
+++ b/ccm-cms/src/main/java/org/arsdigita/cms/CMSConfig.java
@@ -39,49 +39,71 @@ import java.util.List;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-@Configuration
+@Configuration(
+    descBundle = "com.arsdigita.cms.CMSConfig",
+    descKey = "description",
+    titleKey = "title"
+)
 public class CMSConfig {
 
     /**
      * Path for the default item template. Path is relative to the Template Root
      * path.
      */
-    @Setting
+    @Setting(
+        descKey = "defaultItemTemplatePath.desc",
+        labelKey = "defaultItemTemplatePath.label"
+    )
     private String defaultItemTemplatePath = "/default/item.jsp";
 
     /**
      * Path for the default folder template. Path is relative to the Template
      * Root path.
      */
-    @Setting
+    @Setting(
+        descKey = "defaultFolderTemplatePath.desc",
+        labelKey = "defaultFolderTemplatePath.label"
+    )
     private String defaultFolderTemplatePath = "/default/folder.jsp";
 
     /**
      * Path or the root folder for template folders. Path is relative to webapp
      * root. Modify with care! Usually modified by developers only!
      */
-    @Setting
+    @Setting(
+        descKey = "templateRootPath.desc",
+        labelKey = "templateRootPath.label"
+    )
     private String templateRootPath = "/templates/ccm-cms/content-section/";
 
     /**
      * Item Adapters File, path to an XML resource containing adapter
      * specifications. Path is relative to webapp root.
      */
-    @Setting
+    @Setting(
+        descKey = "itemAdapters.desc",
+        labelKey = "itemAdapters.label"
+    )
     private String itemAdapters = "/WEB-INF/resources/cms-item-adapters.xml";
 
     /**
      * Use streamlined content creation: upon item creation, automatically open
      * authoring steps and forward to the next step
      */
-    @Setting
+    @Setting(
+        descKey = "useStreamlinedCreation.desc",
+        labelKey = "useStreamlinedCreation.label"
+    )
     private boolean useStreamlinedCreation = true;
 
     /**
      * DHTML Editor Configuration for use in CMS module, lists the configuration
      * object name and Javascript source location for its definition.
      */
-    @Setting
+    @Setting(
+        descKey = "dhtmlEditorConfig.desc",
+        labelKey = "dhtmlEditorConfig.label"
+    )
     private List<String> dhtmlEditorConfig = Arrays.asList(new String[]{
         "TinyMCE.Config", "scripts/ccm-cms/tinymce-loader.js"
     });
@@ -91,74 +113,107 @@ public class CMSConfig {
      * Defines which plugins to use, e.g.TableOperations,CSS Format:
      * [string,string,string]
      */
-    @Setting
+    @Setting(
+        descKey = "dhtmlEditorPlugins.desc",
+        labelKey = "dhtmlEditorPlugins.label"
+    )
     private List<String> dhtmlEditorPlugins = Arrays.asList(new String[]{
-//        "scripts/ccm-cms/tinymce/plugins/insertimage.js"
-          "http://localhost/web/ccm-cms-tinymce/insertimage.js"
+        //        "scripts/ccm-cms/tinymce/plugins/insertimage.js"
+        "http://localhost/web/ccm-cms-tinymce/insertimage.js"
     });
 
     /**
      * Prevent undesirable functions from being made available, eg images should
      * only be added through the cms methods.
      */
-    @Setting
+    @Setting(
+        descKey = "dhtmlEditorHiddenButtons.desc",
+        labelKey = "dhtmlEditorHiddenButtons.label"
+    )
     private List<String> dhtmlEditorHiddenButtons = Collections.emptyList();
 
     /**
      * Hide section admin tabs from users without administrative rights.
      */
-    @Setting
+    @Setting(
+        descKey = "hideAdminTabs.desc",
+        labelKey = "hideAdminTabs.label"
+    )
     private boolean hideAdminTabs = true;
 
     /**
      * Hide Folder Index Checkbox from folder view
      */
-    @Setting
+    @Setting(
+        descKey = "hideFolderIndexCheckbox.desc",
+        labelKey = "hideFolderIndexCheckbox.label"
+    )
     private boolean hideFolderIndexCheckbox = true;
 
     /**
      * Hide launch date parameter on all forms and displays where it's used.
      */
-    @Setting
+    @Setting(
+        descKey = "hideLaunchDate.desc",
+        labelKey = "hideLaunchDate.label"
+    )
     private boolean hideLaunchDate = true;
 
     /**
      * Require the launch date parameter to be set by the content author.
      */
-    @Setting
+    @Setting(
+        descKey = "requireLaunchDate.desc",
+        labelKey = "requireLaunchDate.label"
+    )
     private boolean requireLaunchDate = true;
 
     /**
      * Hide the templates tab on the item admin page.
      */
-    @Setting
+    @Setting(
+        descKey = "hideTemplatesTab.desc",
+        labelKey = "hideTemplatesTab.label"
+    )
     private boolean hideTemplatesTab = false;
 
     /**
      * Hide the upload file link in the editing of a text asset.
      */
-    @Setting
+    @Setting(
+        descKey = "hideTextAssetUploadFile.desc",
+        labelKey = "hideTextAssetUploadFile.label"
+    )
     private boolean hideTextAssetUploadFile = false;
 
     /**
      * Hide timezone labels (if, for example, all users will be in the same
      * timezone and such information would be unnecessary)
      */
-    @Setting
+    @Setting(
+        descKey = "hideTimezone.desc",
+        labelKey = "hideTimezone.label"
+    )
     private boolean hideTimezone = false;
 
     /**
      * Whether the Wysiwyg editor should clear the text of MSWord tags,
      * everytime the user clicks on 'Save'
      */
-    @Setting
+    @Setting(
+        descKey = "saveTextCleansWordTags.desc",
+        labelKey = "saveTextCleansWordTags.label"
+    )
     private boolean saveTextCleansWordTags = true;
 
     /**
      * Get the search indexing not to process FileAssets, eg to avoid PDF
      * slowdowns
      */
-    @Setting
+    @Setting(
+        descKey = "disableFileAssetExtraction.desc",
+        labelKey = "disableFileAssetExtraction.label"
+    )
     private boolean disableFileAssetExtraction = false;
 
     /**
@@ -172,55 +227,79 @@ public class CMSConfig {
      * link to restart a workflow will not work.
      *
      */
-    @Setting
+    @Setting(
+        descKey = "deleteWorkflowAfterPublication.desc",
+        labelKey = "deleteWorkflowAfterPublication.label"
+    )
     private boolean deleteWorkflowAfterPublication = false;
 
     /**
      * Defines the number of days ahead that are covered in the 'Soon Expired'
      * tab
      */
-    @Setting
+    @Setting(
+        descKey = "soonExpiredTimespanDays.desc",
+        labelKey = "soonExpiredTimespanDays.label"
+    )
     private int soonExpiredTimespanDays = 14;
 
     /**
      * Defines the number of months ahead that are covered in the 'Soon Expired'
      * tab
      */
-    @Setting
+    @Setting(
+        descKey = "soonExpiredTimespanMonths.desc",
+        labelKey = "soonExpiredTimespanMonths.label"
+    )
     private int soonExpiredTimespanMonths = 1;
 
     /**
      * Does a redirect to the unpublished item generate not found error?
      */
-    @Setting
+    @Setting(
+        descKey = "unpublishedNotFound.desc",
+        labelKey = "unpublishedNotFound.label"
+    )
     private boolean unpublishedNotFound = true;
 
     /**
      * Links created through browse interfaces should only be within the same
      * subsite
      */
-    @Setting
+    @Setting(
+        descKey = "linksOnlyInSameSubsite.desc",
+        labelKey = "linksOnlyInSameSubsite.label"
+    )
     private boolean linksOnlyInSameSubsite = false;
 
     /**
      * Link available to reset lifecycle on republish. If false don't display
      * the link otherwise display.
      */
-    @Setting
+    @Setting(
+        descKey = "hideResetLifecycleLink.desc",
+        labelKey = "hideResetLifecycleLink.label"
+    )
     private boolean hideResetLifecycleLink = true;
 
     /**
      * Whether to include INPATH operators to contains clause in intermedia
      * search
      */
-    @Setting
+    @Setting(
+        descKey = "scoreTitleAndKeywords.desc",
+        labelKey = "scoreTitleAndKeywords.label"
+    )
     private boolean scoreTitleAndKeywords = false;
 
     /**
      * Title Weight, the relative weight given to title element within cms:item
      * when ranking search results (only used by interMedia)
      */
-    @Setting
+    @Setting(
+        descKey = "titleWeight.desc",
+        labelKey = "titleWeight.label"
+    )
     private int titleWeight = 1;
 
     /**
@@ -228,13 +307,19 @@ public class CMSConfig {
      * within dublinCore element within cms:item element when ranking search
      * results (only used by interMedia)
      */
-    @Setting
+    @Setting(
+        descKey = "keywordWeight.desc",
+        labelKey = "keywordWeight.label"
+    )
     private int keywordWeight = 1;
 
     /**
      * Limit the item search to current content section
      */
-    @Setting
+    @Setting(
+        descKey = "limitItemSearchToContentSection.desc",
+        labelKey = "limitItemSearchToContentSection.label"
+    )
     private boolean limitItemSearchToContentSection = true;
 
     /**
@@ -245,60 +330,87 @@ public class CMSConfig {
      * Second string is the name of the bebop step component eg
      * com.arsdigita.cms.contenttypes.ui.ImageStep
      */
-    @Setting
+    @Setting(
+        descKey = "skipAssetSteps.desc",
+        labelKey = "skipAssetSteps.label"
+    )
     private List<String> skipAssetSteps = Collections.emptyList();
 
     /**
      * Mandatory Descriptions Content types may refer to this to decide whether
      * to validate against empty descriptions
      */
-    @Setting
+    @Setting(
+        descKey = "mandatoryDescriptions.desc",
+        labelKey = "mandatoryDescriptions.label"
+    )
     private boolean mandatoryDescriptions = false;
 
     /**
      * Delete Finished Lifecycles. Decide whether lifecycles and their phases
      * should be deleted from the system when finished.
      */
-    @Setting
+    @Setting(
+        descKey = "deleteLifecycleWhenComplete.desc",
+        labelKey = "deleteLifecycleWhenComplete.label"
+    )
     private boolean deleteLifecycleWhenComplete = false;
 
     /**
      * Delete Sent Workflow Notifications. Decide whether successfully sent
      * notifications and messages should be deleted from the system
      */
-    @Setting
+    @Setting(
+        descKey = "deleteWorkflowNotificationWhenSend.desc",
+        labelKey = "deleteWorkflowNotificationWhenSend.label"
+    )
     private boolean deleteWorkflowNotificationWhenSend = false;
 
     /**
      * Decide whether successfully sent notifications and messages should be
      * deleted from the system
      */
-    @Setting
+    @Setting(
+        descKey = "deleteExpiryNotificationsWhenSent.desc",
+        labelKey = "deleteExpiryNotificationsWhenSent.label"
+    )
     private boolean deleteExpiryNotificationsWhenSent = false;
 
     /**
      * Amount of time (in hours) before the expiration of a content item that
      * users in the Alert Recipient role are alerted via email
      */
-    @Setting
+    @Setting(
+        descKey = "defaultNotificationTime.desc",
+        labelKey = "defaultNotificationTime.label"
+    )
     private int defaultNotificationTime = 0;
 
     /**
      * Whether a content item's author should be notified by the item's
      * LifecycleListener; defaults to true
      */
-    @Setting
+    @Setting(
+        descKey = "notifyAuthorOnLifecycle.desc",
+        labelKey = "notifyAuthorOnLifecycle.label"
+    )
     private boolean notifyAuthorOnLifecycle = false;
 
     /**
      * XML Mapping of the content center tabs to URLs, see
      * {@link ContentCenterDispatcher}
      */
-    @Setting
+    @Setting(
+        descKey = "contentCenterMap.desc",
+        labelKey = "contentCenterMap.label"
+    )
     private String contentCenterMap
-                       = "/WEB-INF/resources/content-center-map.xml";
+        = "/WEB-INF/resources/content-center-map.xml";
 
-    @Setting
+    @Setting(
+        descKey = "defaultItemResolverClassNames.desc",
+        labelKey = "defaultItemResolverClassNames.label"
+    )
     private List<String> defaultItemResolverClassNames = Arrays.asList(
         new String[]{
             SimpleItemResolver.class.getName()
@@ -310,87 +422,165 @@ public class CMSConfig {
 //            DefaultTemplateResolver.class.getName(),
 //            TemplateResolver.class.getName()
 //        });
-    @Setting
+    @Setting(
+        descKey = "itemSearchDefaultTab.desc",
+        labelKey = "itemSearchDefaultTab.label"
+    )
     private String itemSearchDefaultTab = "flatBrowse";
 
-    @Setting
+    @Setting(
+        descKey = "itemSearchFlatBrowsePanePageSize.desc",
+        labelKey = "itemSearchFlatBrowsePanePageSize.label"
+    )
     private int itemSearchFlatBrowsePanePageSize = 20;
 
-    @Setting
+    @Setting(
+        descKey = "folderBrowseListSize.desc",
+        labelKey = "folderBrowseListSize.label"
+    )
     private int folderBrowseListSize = 20;
 
-    @Setting
+    @Setting(
+        descKey = "folderAtoZShowLimit.desc",
+        labelKey = "folderAtoZShowLimit.label"
+    )
     private int folderAtoZShowLimit = 100;
 
-    @Setting
+    @Setting(
+        descKey = "useOldStyleItemLifecycleItemPane.desc",
+        labelKey = "useOldStyleItemLifecycleItemPane.label"
+    )
     private boolean useOldStyleItemLifecycleItemPane = false;
 
-    @Setting
+    @Setting(
+        descKey = "threadPublishing.desc",
+        labelKey = "threadPublishing.label"
+    )
     private boolean threadPublishing = false;
 
-    @Setting
+    @Setting(
+        descKey = "publishingFailureSender.desc",
+        labelKey = "publishingFailureSender.label"
+    )
     private String publishingFailureSender = "";
 
-    @Setting
+    @Setting(
+        descKey = "publishingFailureReceiver.desc",
+        labelKey = "publishingFailureReceiver.label"
+    )
     private String publishingFailureReceiver = "";
 
-    @Setting
+    @Setting(
+        descKey = "imageBrowserThumbnailMaxWidth.desc",
+        labelKey = "imageBrowserThumbnailMaxWidth.label"
+    )
     private int imageBrowserThumbnailMaxWidth = 50;
 
-    @Setting
+    @Setting(
+        descKey = "imageBrowserThumbnailMaxHeight.desc",
+        labelKey = "imageBrowserThumbnailMaxHeight.label"
+    )
     private int imageBrowserThumbnailMaxHeight = 50;
 
-    @Setting
+    @Setting(
+        descKey = "imageBrowserCaptionSize.desc",
+        labelKey = "imageBrowserCaptionSize.label"
+    )
     private int imageBrowserCaptionSize = 50;
 
-    @Setting
+    @Setting(
+        descKey = "imageBrowserDescriptionSize.desc",
+        labelKey = "imageBrowserDescriptionSize.label"
+    )
     private int imageBrowserDescriptionSize = 400;
 
-    @Setting
+    @Setting(
+        descKey = "imageBrowserTitleSize.desc",
+        labelKey = "imageBrowserTitleSize.label"
+    )
     private int imageBrowserTitleSize = 200;
 
-    @Setting
+    @Setting(
+        descKey = "imageCacheEnabled.desc",
+        labelKey = "imageCacheEnabled.label"
+    )
     private boolean imageCacheEnabled = true;
 
-    @Setting
+    @Setting(
+        descKey = "imageCachePrefetchEnabled.desc",
+        labelKey = "imageCachePrefetchEnabled.label"
+    )
     private boolean imageCachePrefetchEnabled = false;
 
-    @Setting
+    @Setting(
+        descKey = "imageCacheMaxSize.desc",
+        labelKey = "imageCacheMaxSize.label"
+    )
     private int imageCacheMaxSize = 100;
 
-    @Setting
+    @Setting(
+        descKey = "imageCacheMaxAge.desc",
+        labelKey = "imageCacheMaxAge.label"
+    )
     private int imageCacheMaxAge = 300;
 
-    @Setting
+    @Setting(
+        descKey = "attachPersonOrgaUnitsStep.desc",
+        labelKey = "attachPersonOrgaUnitsStep.label"
+    )
     private boolean attachPersonOrgaUnitsStep = true;
 
-    @Setting
+    @Setting(
+        descKey = "personOrgaUnitsStepSortKey.desc",
+        labelKey = "personOrgaUnitsStepSortKey.label"
+    )
     private int personOrgaUnitsStepSortKey = 20;
 
-    @Setting
+    @Setting(
+        descKey = "enableXmlCache.desc",
+        labelKey = "enableXmlCache.label"
+    )
     private boolean enableXmlCache = false;
 
-    @Setting
+    @Setting(
+        descKey = "xmlCacheSize.desc",
+        labelKey = "xmlCacheSize.label"
+    )
     private int xmlCacheSize = 2500;
 
-    @Setting
+    @Setting(
+        descKey = "xmlCacheAge.desc",
+        labelKey = "xmlCacheAge.label"
+    )
     private int xmlCacheAge = 60 * 60 * 24;
 
-    @Setting
+    @Setting(
+        descKey = "categoryAuthoringAddForm.desc",
+        labelKey = "categoryAuthoringAddForm.label"
+    )
     private String categoryAuthoringAddForm = ItemCategoryPicker.class.getName();
 
-    @Setting
+    @Setting(
+        descKey = "categoryAuthoringExtension.desc",
+        labelKey = "categoryAuthoringExtension.label"
+    )
     private String categoryAuthoringExtension = ItemCategoryExtension.class
         .getName();
 
-    @Setting
+    @Setting(
+        descKey = "categoryPickerAjaxExpandAll.desc",
+        labelKey = "categoryPickerAjaxExpandAll.label"
+    )
     private boolean categoryPickerAjaxExpandAll = false;
 
     /**
      * Max length of the description of a link (in database max length are 4000
      * characters)
      */
-    @Setting
+    @Setting(
+        descKey = "linkDescMaxLength.desc",
+        labelKey = "linkDescMaxLength.label"
+    )
     private int linkDescMaxLength = 400;
 
     public static CMSConfig getConfig() {
diff --git a/ccm-cms/src/main/resources/com/arsdigita/cms/CMSConfig.properties b/ccm-cms/src/main/resources/com/arsdigita/cms/CMSConfig.properties
new file mode 100644
index 000000000..86aafc4e7
--- /dev/null
+++ b/ccm-cms/src/main/resources/com/arsdigita/cms/CMSConfig.properties
@@ -0,0 +1,126 @@
+
+title=CMS Configuration
+description=Various settings for customizing content handling
+defaultItemTemplatePath.desc=Path of the default JSP template for Content Items. Only used by the legacy presentation system.
+defaultItemTemplatePath.label=Default Item Template Path
+defaultFolderTemplatePath.label=Default Folder Template Path
+defaultFolderTemplatePath.desc=Path of the default JSP template for folders. Only used by the legacy presentation system.
+templateRootPath.label=Template Root Path
+templateRootPath.desc=Where to look for JSP templates. Only used by the legacy presentation system.
+itemAdapters.label=Item Adapters
+itemAdapters.desc=Path of the the item adapter file
+useStreamlinedCreation.label=Use Streamlined Creation?
+useStreamlinedCreation.desc=
+dhtmlEditorConfig.label=DHTML Editor Configuration
+dhtmlEditorConfig.desc=Configuration of the Rich Text Editor
+dhtmlEditorPlugins.label=DHTML Editor Plugins
+dhtmlEditorPlugins.desc=
+dhtmlEditorHiddenButtons.label=DHTML Editor Hidden Buttons
+dhtmlEditorHiddenButtons.desc=
+hideAdminTabs.label=Hide Admin Tabs?
+hideAdminTabs.desc=Hide Admin Tabs for none admin users?
+hideFolderIndexCheckbox.label=Hide Folder Index Checkbox?
+hideFolderIndexCheckbox.desc=
+hideLaunchDate.label=Hide Launch Date?
+hideLaunchDate.desc=
+requireLaunchDate.label=Require Launch Date?
+requireLaunchDate.desc=
+hideTemplatesTab.label=Hide Templates Tab?
+hideTemplatesTab.desc=
+hideTextAssetUploadFile.label=Hide Text Asset Upload File?
+hideTextAssetUploadFile.desc=
+hideTimezone.label=Hide Timezone?
+hideTimezone.desc=
+saveTextCleansWordTags.label=Save Text Cleans Word Tags?
+saveTextCleansWordTags.desc=
+disableFileAssetExtraction.desc=
+disableFileAssetExtraction.label=Disable File Asset Extraction?
+deleteWorkflowAfterPublication.label=Delete Workflow after publication?
+deleteWorkflowAfterPublication.desc=Whether an item's workflow should be deleted, once the item has been \n(re)published.
+soonExpiredTimespanDays.desc=
+soonExpiredTimespanDays.label=Soon Expired Timespan Days
+soonExpiredTimespanMonths.label=Soon expired timespan months
+soonExpiredTimespanMonths.desc=
+unpublishedNotFound.label=Unpublished not found?
+unpublishedNotFound.desc=Does a redirect to the unpublished item generate not found error?
+linksOnlyInSameSubsite.desc=
+linksOnlyInSameSubsite.label=Links Only In Same Subsite?
+hideResetLifecycleLink.desc=
+hideResetLifecycleLink.label=Hide Reset Lifecycle Link?
+scoreTitleAndKeywords.label=Score title and keywords?
+scoreTitleAndKeywords.desc=
+titleWeight.desc=
+titleWeight.label=Title Weight
+keywordWeight.label=Keyword Weight
+keywordWeight.desc=
+limitItemSearchToContentSection.desc=
+limitItemSearchToContentSection.label=Limit Item Search to Content Section?
+skipAssetSteps.label=Skip Asset Steps?
+skipAssetSteps.desc=
+mandatoryDescriptions.label=Mandatory Descriptions?
+mandatoryDescriptions.desc=
+deleteLifecycleWhenComplete.label=Delete Lifecycle when complete?
+deleteLifecycleWhenComplete.desc=
+deleteWorkflowNotificationWhenSend.label=Delete Workflow Notification when send?
+deleteWorkflowNotificationWhenSend.desc=
+deleteExpiryNotificationsWhenSent.label=Delete Expiry Notifications when sent
+deleteExpiryNotificationsWhenSent.desc=
+defaultNotificationTime.label=Default Notification Time
+defaultNotificationTime.desc=Amount of time (in hours) before the expiration of a content item that  users in the Alert Recipient role are alerted via email
+notifyAuthorOnLifecycle.label=Notify author on lifecycle?
+notifyAuthorOnLifecycle.desc=
+contentCenterMap.label=Content Center Map
+contentCenterMap.desc=
+defaultItemResolverClassNames.label=Default Item Resolver class names
+defaultItemResolverClassNames.desc=
+itemSearchDefaultTab.label=Item Search Default Tab
+itemSearchDefaultTab.desc=
+itemSearchFlatBrowsePanePageSize=Item Search Flat Browse Pane Page Size
+folderBrowseListSize.label=Folder Browse List Size
+folderBrowseListSize.desc=
+folderAtoZShowLimit.label=Folder A to Z  Show Limit
+folderAtoZShowLimit.desc=
+useOldStyleItemLifecycleItemPane.label=Use Old Style Item Lifecycle Item Pane?
+useOldStyleItemLifecycleItemPane.desc=
+threadPublishing.label=Thread Publishing
+threadPublishing.desc=
+publishingFailureSender.label=Publishing Failure Sender
+publishingFailureSender.desc=
+publishingFailureReceiver.label=Publishing Failure Receiver
+publishingFailureReceiver.desc=
+imageBrowserThumbnailMaxWidth.label=Image Browser Thumbnail Max Width
+imageBrowserThumbnailMaxWidth.desc=
+imageBrowserThumbnailMaxHeight.label=Image Browser Thumbnail Max Height
+imageBrowserThumbnailMaxHeight.desc=
+imageBrowserCaptionSize.label=Image Browser Caption Size
+imageBrowserCaptionSize.desc=
+imageBrowserDescriptionSize.label=Image Browser Description Size
+imageBrowserDescriptionSize.desc=
+imageBrowserTitleSize.label=Image Browser Title Size
+imageBrowserTitleSize.desc=
+imageCacheEnabled.label=Image Cache Enabled?
+imageCacheEnabled.desc=
+imageCachePrefetchEnabled.label=Image Cache Prefetch Enabled
+imageCachePrefetchEnabled.desc=
+imageCacheMaxSize.label=Image Cache Max Size
+imageCacheMaxSize.desc=
+imageCacheMaxAge.label=Image Cache Max Age
+imageCacheMaxAge.desc=
+attachPersonOrgaUnitsStep.label=Attach Person Orga Units Step enabled?
+attachPersonOrgaUnitsStep.desc=
+personOrgaUnitsStepSortKey.label=Person Orga Units Step Sort Key
+personOrgaUnitsStepSortKey.desc=
+enableXmlCache.label=Enable XML Cache?
+enableXmlCache.desc=
+xmlCacheSize.label=XML Cache Size
+xmlCacheSize.desc=
+xmlCacheAge.label=XML Cache Age
+xmlCacheAge.desc=
+categoryAuthoringAddForm.label=Category Authoring Add Form
+categoryAuthoringAddForm.desc=
+categoryAuthoringExtension.label=Category Authoring Extension
+categoryAuthoringExtension.desc=
+categoryPickerAjaxExpandAll.label=Category Picker AJAX Expand All?
+categoryPickerAjaxExpandAll.desc=
+linkDescMaxLength.label=Link description max length
+linkDescMaxLength.desc=
diff --git a/ccm-cms/src/main/resources/com/arsdigita/cms/CMSConfig_de.properties b/ccm-cms/src/main/resources/com/arsdigita/cms/CMSConfig_de.properties
new file mode 100644
index 000000000..bd3c11563
--- /dev/null
+++ b/ccm-cms/src/main/resources/com/arsdigita/cms/CMSConfig_de.properties
@@ -0,0 +1,126 @@
+
+title=CMS Konfiguration
+description=Einstellungen bez\u00fcglich Bearbeitung und Anzeige von Inhalten
+defaultItemTemplatePath.desc=Pfad der Standard-JSP-Template f\u00fcr Content Items. Nur vom alten Pr\u00e4sentationssystem genutzt.
+defaultItemTemplatePath.label=Pfad der Standard Template f\u00fcr Content Items
+defaultFolderTemplatePath.label=Pfad der Standard-JSP-Template f\u00fcr Ordner
+defaultFolderTemplatePath.desc=Pfad der Standard-JSP-Template f\u00fcr Ordner. Nur vom alten Pr\u00e4sentationssystem genutzt.
+templateRootPath.label=Suchpfad f\u00fcr Templates
+templateRootPath.desc=Ordner in dem nach JSP-Templates gesucht wird. Nur vom alten Pr\u00e4sentationssystem genutzt.
+itemAdapters.label=Item Adapter
+itemAdapters.desc=Pfad der Item-Adapter-Datei
+useStreamlinedCreation.label=Use Streamlined Creation?
+useStreamlinedCreation.desc=
+dhtmlEditorConfig.label=DHTML Editor Konfiguration
+dhtmlEditorConfig.desc=Konfiguration des Text Editors
+dhtmlEditorPlugins.label=DHTML Editor Plugins
+dhtmlEditorPlugins.desc=
+dhtmlEditorHiddenButtons.label=DHTML Editor Deaktivierte Funktionen
+dhtmlEditorHiddenButtons.desc=
+hideAdminTabs.label=Admin Tabs verstecken?
+hideAdminTabs.desc=Sollen die Admin-Tabs f\u00fcr Benutzer*innen ohnen Administrations-Rechte sichtbar sein?
+hideFolderIndexCheckbox.label=Index-Checkbox f\u00fcr Ordner verstecken?
+hideFolderIndexCheckbox.desc=
+hideLaunchDate.label=Start-Datum verstecken?
+hideLaunchDate.desc=
+requireLaunchDate.label=Startdatum erforderlich?
+requireLaunchDate.desc=
+hideTemplatesTab.label=Vorlaben Tab verbergen?
+hideTemplatesTab.desc=
+hideTextAssetUploadFile.label=Hochladen f\u00fcr Text-Assets verbergen?
+hideTextAssetUploadFile.desc=
+hideTimezone.label=Zeitzone verstecken?
+hideTimezone.desc=
+saveTextCleansWordTags.label=Speichern bereinigt Word Tags?
+saveTextCleansWordTags.desc=
+disableFileAssetExtraction.desc=
+disableFileAssetExtraction.label=Analyse von hochgeladenen Dateien deaktivieren?
+deleteWorkflowAfterPublication.label=Arbeitsablauf nach dem Publizieren l\u00f6schen?
+deleteWorkflowAfterPublication.desc=
+soonExpiredTimespanDays.desc=
+soonExpiredTimespanDays.label=Soon Expired Timespan Days
+soonExpiredTimespanMonths.label=Soon expired timespan months
+soonExpiredTimespanMonths.desc=
+unpublishedNotFound.label=Unpublished not found?
+unpublishedNotFound.desc=Does a redirect to the unpublished item generate not found error?
+linksOnlyInSameSubsite.desc=
+linksOnlyInSameSubsite.label=Links Only In Same Subsite?
+hideResetLifecycleLink.desc=
+hideResetLifecycleLink.label=Hide Reset Lifecycle Link?
+scoreTitleAndKeywords.label=Score title and keywords?
+scoreTitleAndKeywords.desc=
+titleWeight.desc=
+titleWeight.label=Title Weight
+keywordWeight.label=Keyword Weight
+keywordWeight.desc=
+limitItemSearchToContentSection.desc=
+limitItemSearchToContentSection.label=Limit Item Search to Content Section?
+skipAssetSteps.label=Skip Asset Steps?
+skipAssetSteps.desc=
+mandatoryDescriptions.label=Mandatory Descriptions?
+mandatoryDescriptions.desc=
+deleteLifecycleWhenComplete.label=Delete Lifecycle when complete?
+deleteLifecycleWhenComplete.desc=
+deleteWorkflowNotificationWhenSend.label=Delete Workflow Notification when send?
+deleteWorkflowNotificationWhenSend.desc=
+deleteExpiryNotificationsWhenSent.label=Delete Expiry Notifications when sent
+deleteExpiryNotificationsWhenSent.desc=
+defaultNotificationTime.label=Default Notification Time
+defaultNotificationTime.desc=Amount of time (in hours) before the expiration of a content item that users in the Alert Recipient role are alerted via email
+notifyAuthorOnLifecycle.label=Notify author on lifecycle?
+notifyAuthorOnLifecycle.desc=
+contentCenterMap.label=Content Center Map
+contentCenterMap.desc=
+defaultItemResolverClassNames.label=Default Item Resolver class names
+defaultItemResolverClassNames.desc=
+itemSearchDefaultTab.label=Item Search Default Tab
+itemSearchDefaultTab.desc=
+itemSearchFlatBrowsePanePageSize=Item Search Flat Browse Pane Page Size
+folderBrowseListSize.label=Folder Browse List Size
+folderBrowseListSize.desc=
+folderAtoZShowLimit.label=Folder A to Z  Show Limit
+folderAtoZShowLimit.desc=
+useOldStyleItemLifecycleItemPane.label=Use Old Style Item Lifecycle Item Pane?
+useOldStyleItemLifecycleItemPane.desc=
+threadPublishing.label=Thread Publishing
+threadPublishing.desc=
+publishingFailureSender.label=Publishing Failure Sender
+publishingFailureSender.desc=
+publishingFailureReceiver.label=Publishing Failure Receiver
+publishingFailureReceiver.desc=
+imageBrowserThumbnailMaxWidth.label=Image Browser Thumbnail Max Width
+imageBrowserThumbnailMaxWidth.desc=
+imageBrowserThumbnailMaxHeight.label=Image Browser Thumbnail Max Height
+imageBrowserThumbnailMaxHeight.desc=
+imageBrowserCaptionSize.label=Image Browser Caption Size
+imageBrowserCaptionSize.desc=
+imageBrowserDescriptionSize.label=Image Browser Description Size
+imageBrowserDescriptionSize.desc=
+imageBrowserTitleSize.label=Image Browser Title Size
+imageBrowserTitleSize.desc=
+imageCacheEnabled.label=Image Cache Enabled?
+imageCacheEnabled.desc=
+imageCachePrefetchEnabled.label=Image Cache Prefetch Enabled
+imageCachePrefetchEnabled.desc=
+imageCacheMaxSize.label=Image Cache Max Size
+imageCacheMaxSize.desc=
+imageCacheMaxAge.label=Image Cache Max Age
+imageCacheMaxAge.desc=
+attachPersonOrgaUnitsStep.label=Attach Person Orga Units Step enabled?
+attachPersonOrgaUnitsStep.desc=
+personOrgaUnitsStepSortKey.label=Person Orga Units Step Sort Key
+personOrgaUnitsStepSortKey.desc=
+enableXmlCache.label=Enable XML Cache?
+enableXmlCache.desc=
+xmlCacheSize.label=XML Cache Size
+xmlCacheSize.desc=
+xmlCacheAge.label=XML Cache Age
+xmlCacheAge.desc=
+categoryAuthoringAddForm.label=Category Authoring Add Form
+categoryAuthoringAddForm.desc=
+categoryAuthoringExtension.label=Category Authoring Extension
+categoryAuthoringExtension.desc=
+categoryPickerAjaxExpandAll.label=Category Picker AJAX Expand All?
+categoryPickerAjaxExpandAll.desc=
+linkDescMaxLength.label=Link description max length
+linkDescMaxLength.desc=
diff --git a/ccm-core/src/main/java/com/arsdigita/bebop/BebopConfig.java b/ccm-core/src/main/java/com/arsdigita/bebop/BebopConfig.java
index bff6acabb..b75adb31e 100755
--- a/ccm-core/src/main/java/com/arsdigita/bebop/BebopConfig.java
+++ b/ccm-core/src/main/java/com/arsdigita/bebop/BebopConfig.java
@@ -41,32 +41,59 @@ import java.util.stream.Collectors;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Configuration(
-    descKey = "bebop.config.description")
+    descBundle = "com.arsdigita.bebop.BebopConfig",
+    descKey = "description",
+    titleKey = "title"
+)
 public final class BebopConfig {
 
-    @Setting
+    @Setting(
+        descKey = "presenterClassName.desc",
+        labelKey = "presenterClassName.label"
+    )
     private String presenterClassName = PageTransformer.class.getName();
 
-    @Setting
+    @Setting(
+        descKey = "basePageClassName.desc",
+        labelKey = "basePageClassName.label"
+    )
     private String basePageClassName = SimplePage.class.getName();
 
-    @Setting
+    @Setting(
+        descKey = "tidyConfigFile.desc",
+        labelKey = "tidyConfigFile.label"
+    )
     private String tidyConfigFile
                        = "com/arsdigita/bebop/parameters/tidy.properties";
 
-    @Setting
+    @Setting(
+        descKey = "fancyErrors.desc",
+        labelKey = "fancyErrors.label"
+    )
     private Boolean fancyErrors = false;
 
-    @Setting
+    @Setting(
+        descKey = "dcpOnButtons.desc",
+        labelKey = "dcpOnButtons.label"
+    )
     private Boolean dcpOnButtons = true;
 
-    @Setting
+    @Setting(
+        descKey = "dcpOnLinks.desc",
+        labelKey = "dcpOnLinks.label"
+    )
     private Boolean dcpOnLinks = false;
 
-    @Setting
+    @Setting(
+        descKey = "treeSelectEnabled.desc",
+        labelKey = "treeSelectEnabled.label"
+    )
     private Boolean treeSelectEnabled = false;
 
-    @Setting
+    @Setting(
+        descKey = "dhtmlEditors.desc",
+        labelKey = "dhtmlEditors.label"
+    )
     private Set<String> dhtmlEditors = new HashSet<>(
         Arrays.asList(new String[]{BebopConstants.BEBOP_XINHAEDITOR,
                                    BebopConstants.BEBOP_FCKEDITOR,
@@ -74,14 +101,23 @@ public final class BebopConfig {
                                    BebopConstants.BEBOP_CCMEDITOR,
                                    BebopConstants.BEBOP_TINYMCE_EDITOR}));
 
-    @Setting
+    @Setting(
+        descKey = "defaultDhtmlEditor.desc",
+        labelKey = "defaultDhtmlEditor.label"
+    )
     private String defaultDhtmlEditor = BebopConstants.BEBOP_TINYMCE_EDITOR;
 
-    @Setting
+    @Setting(
+        descKey = "dhtmlEditorSrcFile.desc",
+        labelKey = "dhtmlEditorSrcFile.label"
+    )
 //    private String dhtmlEditorSrcFile = "/ccm-editor/ccm-editor-loader.js";
     private String dhtmlEditorSrcFile = "/webjars/tinymce/4.8.2/tinymce.js";
 
-    @Setting
+    @Setting(
+        descKey = "showClassName.desc",
+        labelKey = "showClassName.label"
+    )
     private Boolean showClassName = false;
 
     public static BebopConfig getConfig() {
diff --git a/ccm-core/src/main/java/com/arsdigita/dispatcher/DispatcherConfig.java b/ccm-core/src/main/java/com/arsdigita/dispatcher/DispatcherConfig.java
index fbc41278f..2a4e44466 100755
--- a/ccm-core/src/main/java/com/arsdigita/dispatcher/DispatcherConfig.java
+++ b/ccm-core/src/main/java/com/arsdigita/dispatcher/DispatcherConfig.java
@@ -28,19 +28,35 @@ import org.libreccm.configuration.Setting;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-@Configuration
+@Configuration(
+    descBundle = "com.arsdigita.dispatcher.DispatcherConfig",
+    descKey = "description",
+    titleKey = "title"
+)
 public final class DispatcherConfig {
 
-    @Setting
+    @Setting(
+        descKey = "cachingActive.desc",
+        labelKey = "cachingActive.label"
+    )
     private Boolean cachingActive = true;
 
-    @Setting
+    @Setting(
+        descKey = "defaultExpiry.desc",
+        labelKey = "defaultExpiry.label"
+    )
     private Integer defaultExpiry = 259200;
 
-    @Setting
+    @Setting(
+        descKey = "staticUrlPrefix.desc",
+        labelKey = "statusUrlPrefix.label"
+    )
     private String staticUrlPrefix = "/STATICII/";
 
-    @Setting
+    @Setting(
+        descKey = "defaultPageClass.desc",
+        labelKey = "defaultPageClass.label"
+    )
     private String defaultPageClass = "com.arsdigita.bebop.Page";
 
     public static DispatcherConfig getConfig() {
diff --git a/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java b/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java
index a237ed80a..e528915bf 100644
--- a/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java
+++ b/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java
@@ -179,7 +179,7 @@ public class SettingManager {
             settingInfo.setLabelKey(String.join(".", field.getName(),
                                                 "label"));
         } else {
-            settingInfo.setLabelKey(name);
+            settingInfo.setLabelKey(settingAnnotation.labelKey());
         }
 
         if (Strings.isBlank(settingAnnotation.descKey())) {
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
index 2a1680169..d105e963f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
@@ -11,18 +11,20 @@
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
-                #{AdminMessages['configuration.label']}
+                <a href="#{mvc.uri('ConfigurationController#getSettings')}">
+                    #{AdminMessages['configuration.label']}
+                </a>
             </li>
-            <li class="breadcrumb-item">>
+            <li class="breadcrumb-item">
                 #{confLabel}
             </li>
-            <li class="breadcrumb-item active">>
+            <li class="breadcrumb-item active">
                 #{AdminMessages['configuration.settings.label']}
             </li>
         </ui:define>
 
         <ui:define name="main">
-            <div class="container">
+            <div class="container-fluid">
                 <h1>#{confLabel}</h1>
                 <p>
                     #{confDescription}
diff --git a/ccm-core/src/main/resources/com/arsdigita/bebop/BebopConfig.properties b/ccm-core/src/main/resources/com/arsdigita/bebop/BebopConfig.properties
new file mode 100644
index 000000000..773a769f4
--- /dev/null
+++ b/ccm-core/src/main/resources/com/arsdigita/bebop/BebopConfig.properties
@@ -0,0 +1,41 @@
+# Copyright (C) 2020 LibreCCM Foundation.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301  USA
+
+description=Settings for legacy UI framework used by CCM
+title=Bebop Configuration
+presenterClassName.label=Presenter Class name
+presenterClassName.desc=Fully qualified class name of the presenter implementation to use
+basePageClassName.desc=Fully qualified class name of the basic page component
+basePageClassName.label=Base Page Class Name
+tidyConfigFile.desc=
+tidyConfigFile.label=Tidy Configuration File
+fancyErrors.desc=
+fancyErrors.label=Fancy Errors?
+dcpOnButtons.desc=
+dcpOnButtons.label=Enable Double-Click protection on buttons?
+dcpOnLinks.desc=
+dcpOnLinks.label=Enable Double-Click protecttion on links?
+treeSelectEnabled.desc=
+treeSelectEnabled.label=Tree Select Enabled
+dhtmlEditors.desc=
+dhtmlEditors.label=DHTML editors
+defaultDhtmlEditor.desc=Default DHTML Editor
+defaultDhtmlEditor.label=Default DHTML Editor
+dhtmlEditorSrcFile.desc=
+dhtmlEditorSrcFile.label=DHTML Editor Main File
+showClassName.desc=
+showClassName.label=Show Class Name?
diff --git a/ccm-core/src/main/resources/com/arsdigita/bebop/BebopConfig_de.properties b/ccm-core/src/main/resources/com/arsdigita/bebop/BebopConfig_de.properties
new file mode 100644
index 000000000..773a769f4
--- /dev/null
+++ b/ccm-core/src/main/resources/com/arsdigita/bebop/BebopConfig_de.properties
@@ -0,0 +1,41 @@
+# Copyright (C) 2020 LibreCCM Foundation.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301  USA
+
+description=Settings for legacy UI framework used by CCM
+title=Bebop Configuration
+presenterClassName.label=Presenter Class name
+presenterClassName.desc=Fully qualified class name of the presenter implementation to use
+basePageClassName.desc=Fully qualified class name of the basic page component
+basePageClassName.label=Base Page Class Name
+tidyConfigFile.desc=
+tidyConfigFile.label=Tidy Configuration File
+fancyErrors.desc=
+fancyErrors.label=Fancy Errors?
+dcpOnButtons.desc=
+dcpOnButtons.label=Enable Double-Click protection on buttons?
+dcpOnLinks.desc=
+dcpOnLinks.label=Enable Double-Click protecttion on links?
+treeSelectEnabled.desc=
+treeSelectEnabled.label=Tree Select Enabled
+dhtmlEditors.desc=
+dhtmlEditors.label=DHTML editors
+defaultDhtmlEditor.desc=Default DHTML Editor
+defaultDhtmlEditor.label=Default DHTML Editor
+dhtmlEditorSrcFile.desc=
+dhtmlEditorSrcFile.label=DHTML Editor Main File
+showClassName.desc=
+showClassName.label=Show Class Name?
diff --git a/ccm-core/src/main/resources/com/arsdigita/dispatcher/DispatcherConfig.properties b/ccm-core/src/main/resources/com/arsdigita/dispatcher/DispatcherConfig.properties
new file mode 100644
index 000000000..2606701a7
--- /dev/null
+++ b/ccm-core/src/main/resources/com/arsdigita/dispatcher/DispatcherConfig.properties
@@ -0,0 +1,27 @@
+# Copyright (C) 2020 LibreCCM Foundation.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301  USA
+
+title=Dispatcher Configuration
+description=Settings for the legacy dispatcher
+cachingActive.desc=Toggle whether or not to use HTTP/1.1 caching
+cachingActive.label=Caching Active?
+defaultExpiry.desc=Set the default expiration time for HTTP caching
+defaultExpiry.label=Default Cache Expiry
+statusUrlPrefix.desc=The default page class. A custom installation may provide it's own implementation. Use with care because all pages inherit from this class! 
+staticUrlPrefix.label=Static URL Prefix
+defaultPageClass.desc=Prefix used for serving static files
+defaultPageClass.label=Default Page Class
diff --git a/ccm-core/src/main/resources/com/arsdigita/dispatcher/DispatcherConfig_de.properties b/ccm-core/src/main/resources/com/arsdigita/dispatcher/DispatcherConfig_de.properties
new file mode 100644
index 000000000..49a8a02ca
--- /dev/null
+++ b/ccm-core/src/main/resources/com/arsdigita/dispatcher/DispatcherConfig_de.properties
@@ -0,0 +1,27 @@
+# Copyright (C) 2020 LibreCCM Foundation.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301  USA
+
+title=Dispatcher Configuration
+description=
+cachingActive.desc=Toggle whether or not to use HTTP/1.1 caching
+cachingActive.label=Caching Active?
+defaultExpiry.desc=Set the default expiration time for HTTP caching
+defaultExpiry.label=Default Cache Expiry
+statusUrlPrefix.desc=The default page class. A custom installation may provide it's own implementation. Use with care because all pages inherit from this class! 
+staticUrlPrefix.label=Static URL Prefix
+defaultPageClass.desc=Prefix used for serving static files
+defaultPageClass.label=Default Page Class
diff --git a/ccm-core/src/main/resources/com/arsdigita/globalization/GlobalizationConfigDescription.properties b/ccm-core/src/main/resources/com/arsdigita/globalization/GlobalizationConfigDescription.properties
index 498ae2705..982cecd08 100644
--- a/ccm-core/src/main/resources/com/arsdigita/globalization/GlobalizationConfigDescription.properties
+++ b/ccm-core/src/main/resources/com/arsdigita/globalization/GlobalizationConfigDescription.properties
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301  USA
 
-description = A configuration record for configuration of the core globalization package
+globalization.config.description = A configuration record for configuration of the core globalization package
 
 defaultCharset.label = Default Charset
 defaultCharset.description = Default character set for locales not explicitly listed in the  locales parameter.
\ No newline at end of file
diff --git a/ccm-core/src/main/resources/com/arsdigita/kernel/KernelConfigDescription.properties b/ccm-core/src/main/resources/com/arsdigita/kernel/KernelConfigDescription.properties
index 56a265997..1347247da 100644
--- a/ccm-core/src/main/resources/com/arsdigita/kernel/KernelConfigDescription.properties
+++ b/ccm-core/src/main/resources/com/arsdigita/kernel/KernelConfigDescription.properties
@@ -3,8 +3,8 @@ description = Configure several basic properties for LibreCCM
 debugEnabled.label = Global debug flag
 debugEnabled.description = Enables or disables WAF debugging
 
-webdev_supportEnabled.label = Webdev support enabled?
-webdev_supportEnabled.description = Enables or disables Webdev support
+webdevSupportEnabled.label=Webdev support enabled?
+webdevSupportEnabled.description=Enables or disables Webdev support
 
 data_permissionCheckEnabled.label = DML permission checking flag
 data_permissionCheckEnabled.description = Enables or disables permissions checks on database writes
@@ -18,8 +18,18 @@ ssoEnabled.description = Enables or disables SSO login
 rememberLoginEnabled.label = Remember login by default
 rememberLoginEnabled.description = Determines whether the "remember login" feature is enabled or disabled by default
 
-kernelConfig.secureLoginEnabled.label = Require secure login?
-kernelConfig.secureLoginEnabled.description = Accept only credentials presented over secure connection?
-
 supportedLanguages.label = Set the supported languages for categorization
 supportedLanguages.description = Set the languages supported for this installation (for content creation). Uses the ISO language codes.
+title=Kernel Configuration
+dataPermissionCheckEnabled.label=Data Permission Check Enabled?
+defaultLanguage.label=Default Language
+exportPath.label=Export Path
+exportPath.description=Where to store export files
+importPath.label=Import Path
+importPath.description=Where to look for files to import
+jwtSecret.label=JWT secret
+jwtSecret.description=Secret for generating JSON Web Tokens
+secureLoginEnabled.label=Secure Login enabled?
+secureLoginEnabled.description=Force HTTPS for login?
+systemEmailAddress.label=System Email address
+systemEmailAddress.description=Email address used a from address for mail generated by the CCM
diff --git a/ccm-core/src/main/resources/com/arsdigita/kernel/KernelConfigDescription_de.properties b/ccm-core/src/main/resources/com/arsdigita/kernel/KernelConfigDescription_de.properties
new file mode 100644
index 000000000..1347247da
--- /dev/null
+++ b/ccm-core/src/main/resources/com/arsdigita/kernel/KernelConfigDescription_de.properties
@@ -0,0 +1,35 @@
+description = Configure several basic properties for LibreCCM
+
+debugEnabled.label = Global debug flag
+debugEnabled.description = Enables or disables WAF debugging
+
+webdevSupportEnabled.label=Webdev support enabled?
+webdevSupportEnabled.description=Enables or disables Webdev support
+
+data_permissionCheckEnabled.label = DML permission checking flag
+data_permissionCheckEnabled.description = Enables or disables permissions checks on database writes
+
+primaryUserIdentifier.label = The primary user identification
+primaryUserIdentifier.description = Determines whether email addresses or screen names are used to authenticate users. Valid values: "screen_name" or "email"
+
+ssoEnabled.label = Enable SSO login?
+ssoEnabled.description = Enables or disables SSO login
+
+rememberLoginEnabled.label = Remember login by default
+rememberLoginEnabled.description = Determines whether the "remember login" feature is enabled or disabled by default
+
+supportedLanguages.label = Set the supported languages for categorization
+supportedLanguages.description = Set the languages supported for this installation (for content creation). Uses the ISO language codes.
+title=Kernel Configuration
+dataPermissionCheckEnabled.label=Data Permission Check Enabled?
+defaultLanguage.label=Default Language
+exportPath.label=Export Path
+exportPath.description=Where to store export files
+importPath.label=Import Path
+importPath.description=Where to look for files to import
+jwtSecret.label=JWT secret
+jwtSecret.description=Secret for generating JSON Web Tokens
+secureLoginEnabled.label=Secure Login enabled?
+secureLoginEnabled.description=Force HTTPS for login?
+systemEmailAddress.label=System Email address
+systemEmailAddress.description=Email address used a from address for mail generated by the CCM

From 8e1a12e72ffdb8bbf2df3b99afd46c62b9718e23 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 2 Nov 2020 11:36:24 +0100
Subject: [PATCH 30/93] Help for settings

---
 .../ui/admin/configuration/settings.xhtml     | 60 +++++++++++++++----
 .../org/libreccm/ui/AdminBundle.properties    |  3 +
 .../org/libreccm/ui/AdminBundle_de.properties |  3 +
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
index d105e963f..61f2b735d 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -64,17 +64,53 @@
                                 </td>
                                 <td>#{setting.defaultValue}</td>
                                 <td>
-                                    <button class="btn btn-info" 
-                                            title="#{AdminMessages.getMessage('configuration.settings.table.actions.info.help', [setting.label])}"
-                                            type="button">
-                                         <svg class="bi"
-                                             width="1em"
-                                             height="1em"
-                                             fill="currentColor">
-                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#info-circle" />
-                                         </svg>
-                                        #{AdminMessages['configuration.settings.table.actions.info']}
-                                    </button>
+                                    <c:if test="#{setting.description.length() > 0}">
+                                        <button class="btn btn-info" 
+                                                data-toggle="modal"
+                                                data-target="#setting-info-#{setting.name}"
+                                                title="#{AdminMessages.getMessage('configuration.settings.table.actions.info.help', [setting.label])}"
+                                                type="button">
+                                            <svg class="bi"
+                                                 width="1em"
+                                                 height="1em"
+                                                 fill="currentColor">
+                                                <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#info-circle" />
+                                            </svg>
+                                            #{AdminMessages['configuration.settings.table.actions.info']}
+                                        </button>
+                                        <div aria-hidden="true"
+                                             aria-labelledby="setting-info#{setting.name}-label"
+                                             class="modal fade"
+                                             data-backdrop="static"
+                                             id="setting-info-#{setting.name}"
+                                             tabindex="-1">
+                                            <div class="modal-dialog">
+                                                <div class="modal-content">
+                                                    <div class="modal-header">
+                                                        <h2 class="model-title"
+                                                            id="setting-info-#{setting.name}-label">#{AdminMessages.getMessage('configuration.settings.setting.info.label', [setting.label])}</h2>
+                                                        <button aria-label="#{AdminMessages['configuration.settings.setting.info.close']}"
+                                                                class="close"
+                                                                data-dismiss="modal"
+                                                                type="button"><span aria-hidden="true">&times;</span></button>
+
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <p>
+                                                            #{setting.description}
+                                                        </p>
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button class="btn btn-secondary" 
+                                                                data-dismiss="modal"
+                                                                type="button">
+                                                            #{AdminMessages['configuration.settings.setting.info.dismiss']}
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </c:if>
                                 </td>
                                 <td>
                                     <button class="btn btn-primary" 
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index ee6e5c0b9..e18837fce 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -218,3 +218,6 @@ configuration.settings.table.actions.info.help=Show description of setting {0}
 configuration.settings.table.actions.edit=Edit
 configuration.settings.table.actions.reset.help=Reset setting {0} to default value {1}
 configuration.settings.table.actions.reset=Reset
+configuration.settings.setting.info.label=Setting {0} Info
+configuration.settings.setting.info.close=Close
+configuration.settings.setting.info.dismiss=OK
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index ee0018fde..0c917d5f8 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -218,3 +218,6 @@ configuration.settings.table.actions.info.help=Beschreibung f\u00fcr Einstellung
 configuration.settings.table.actions.edit=Bearbeiten
 configuration.settings.table.actions.reset.help=Einstellung {0} auf Standardwert {1} zur\u00fccksetzen
 configuration.settings.table.actions.reset=Zur\u00fccksetzen
+configuration.settings.setting.info.label=Setting {0} Info
+configuration.settings.setting.info.close=Schlie\u00dfen
+configuration.settings.setting.info.dismiss=OK

From 5232b55eae127b1012c4b067084effd72aad8b4f Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 2 Nov 2020 20:50:19 +0100
Subject: [PATCH 31/93] Settings dialog basic design

---
 ccm-cms/src/main/java/org/librecms/Cms.java   | 15 ++--
 .../configuration/AbstractSetting.java        | 16 +++-
 .../main/java/org/libreccm/core/CcmCore.java  | 23 +++---
 .../ui/admin/configuration/settings.xhtml     | 73 +++++++++++++++++++
 .../org/libreccm/ui/AdminBundle.properties    |  4 +
 .../org/libreccm/ui/AdminBundle_de.properties |  4 +
 6 files changed, 113 insertions(+), 22 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/Cms.java b/ccm-cms/src/main/java/org/librecms/Cms.java
index bb03e40a7..4d532f286 100644
--- a/ccm-cms/src/main/java/org/librecms/Cms.java
+++ b/ccm-cms/src/main/java/org/librecms/Cms.java
@@ -93,36 +93,39 @@ import java.util.Properties;
             servletPath = "/templates/servlet/pages"
         )
     },
+    configurations = {
+        org.arsdigita.cms.CMSConfig.class
+    },
     pageModelComponentModels = {
         @PageModelComponentModel(
             modelClass = CategorizedItemComponent.class,
             editor = CategorizedItemComponentForm.class,
             descBundle = CmsConstants.CMS_BUNDLE,
             titleKey
-                = "cms.ui.pagemodel.components.categorized_item_component.title",
+            = "cms.ui.pagemodel.components.categorized_item_component.title",
             descKey
-                = "cms.ui.pagemodel.components.categorized_item_component.desc"),
+            = "cms.ui.pagemodel.components.categorized_item_component.desc"),
         @PageModelComponentModel(
             modelClass = CategoryTreeComponent.class,
             editor = CategoryTreeComponentForm.class,
             descBundle = CmsConstants.CMS_BUNDLE,
             titleKey
-                = "cms.ui.pagemodel.components.category_tree_component.title",
+            = "cms.ui.pagemodel.components.category_tree_component.title",
             descKey = "cms.ui.pagemodel.components.category_tree_component.desc"),
         @PageModelComponentModel(
             modelClass = FixedContentItemComponent.class,
             editor = FixedContentItemComponentForm.class,
             descBundle = CmsConstants.CMS_BUNDLE,
             titleKey
-                = "cms.ui.pagemodel.components.fixed_contentitem_component.title",
+            = "cms.ui.pagemodel.components.fixed_contentitem_component.title",
             descKey
-                = "cms.ui.pagemodel.components.fixed_contentitem_component.desc"),
+            = "cms.ui.pagemodel.components.fixed_contentitem_component.desc"),
         @PageModelComponentModel(
             modelClass = GreetingItemComponent.class,
             editor = GreetingItemComponentForm.class,
             descBundle = CmsConstants.CMS_BUNDLE,
             titleKey
-                = "cms.ui.pagemodel.components.greetingitem_component.title",
+            = "cms.ui.pagemodel.components.greetingitem_component.title",
             descKey = "cms.ui.pagemodel.components.greetingitem_component.desc"),
         @PageModelComponentModel(
             modelClass = ItemListComponent.class,
diff --git a/ccm-core/src/main/java/org/libreccm/configuration/AbstractSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/AbstractSetting.java
index 7c4d1355d..fb81f9c86 100644
--- a/ccm-core/src/main/java/org/libreccm/configuration/AbstractSetting.java
+++ b/ccm-core/src/main/java/org/libreccm/configuration/AbstractSetting.java
@@ -18,15 +18,27 @@
  */
 package org.libreccm.configuration;
 
-import org.hibernate.validator.constraints.NotBlank;
 
-import javax.persistence.*;
 import javax.validation.constraints.Pattern;
+
 import java.io.Serializable;
 import java.util.Objects;
 
 import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+import javax.validation.constraints.NotBlank;
+
 /**
  * Abstract base class for all settings.
  *
diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java
index d63127fbd..35dfbe403 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java
@@ -47,11 +47,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-
-
 /**
  * Describes the {@code ccm-core} module.
- *  
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Module(applicationTypes = {
@@ -59,22 +57,19 @@ import java.util.Properties;
                      descBundle = "com.arsdigita.ui.login.LoginResources",
                      singleton = true,
                      creator = LoginApplicationCreator.class,
-                     servlet = LoginServlet.class)
-    ,
+                     servlet = LoginServlet.class),
     @ApplicationType(name = AdminUiConstants.ADMIN_APP_TYPE,
                      descBundle = "com.arsdigita.ui.admin.AdminResources",
                      singleton = true,
                      creator = AdminApplicationCreator.class,
-                     servlet = AdminServlet.class)
-    ,
+                     servlet = AdminServlet.class),
     @ApplicationType(name = "org.libreccm.ui.admin.AdminFaces",
                      descBundle = "com.arsdigita.ui.admin.AdminResources",
                      singleton = true,
                      creator = AdminJsfApplicationCreator.class,
-                     servletPath = "/admin-jsf/admin.xhtml")},
-        pageModelComponentModels = {
-            
-        },
+                     servletPath = "/admin-jsf/admin.xhtml")
+    },
+        pageModelComponentModels = {},
         configurations = {
             com.arsdigita.bebop.BebopConfig.class,
             com.arsdigita.dispatcher.DispatcherConfig.class,
@@ -107,17 +102,17 @@ public class CcmCore implements CcmModule {
 
         LOGGER.info("Setting up admin application (/ccm/admin/)...");
         final AdminApplicationSetup adminSetup
-                                        = new AdminApplicationSetup(event);
+            = new AdminApplicationSetup(event);
         adminSetup.setup();
 
         LOGGER.info("Setting up admin-jsf application (/ccm/admin-jsf/)...");
         final AdminJsfApplicationSetup adminJsfSetup
-                                           = new AdminJsfApplicationSetup(event);
+            = new AdminJsfApplicationSetup(event);
         adminJsfSetup.setup();
 
         LOGGER.info("Setting up login application...");
         final LoginApplicationSetup loginSetup
-                                        = new LoginApplicationSetup(event);
+            = new LoginApplicationSetup(event);
         loginSetup.setup();
 
         LOGGER.info("Importing category domains from bundle (if any)...");
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
index 61f2b735d..0e707a1b9 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
@@ -114,6 +114,8 @@
                                 </td>
                                 <td>
                                     <button class="btn btn-primary" 
+                                            data-toggle="modal"
+                                            data-target="#setting-#{setting.name}-edit-dialog"
                                             type="button">
                                         <svg class="bi"
                                              width="1em"
@@ -123,6 +125,77 @@
                                         </svg>
                                         #{AdminMessages['configuration.settings.table.actions.edit']}
                                     </button>
+                                    <div aria-hidden="true"
+                                         aria-labelledby="setting-#{setting.name}-edit-dialog-title"
+                                         class="modal fade"
+                                         data-backdrop="static"
+                                         id="setting-#{setting.name}-edit-dialog"
+                                         tabindex="-1">
+                                        <div class="modal-dialog">
+                                            <div class="modal-content">
+                                                <div class="modal-header">
+                                                    <h2 class="model-title"
+                                                        id="setting-#{setting.name}-edit-dialog">
+                                                        #{AdminMessages.getMessage('configuration.settings.setting.dialog.title', [setting.label])}
+                                                    </h2>
+                                                    <button aria-label="#{AdminMessages['configuration.settings.setting.dialog.close']}"
+                                                            class="close"
+                                                            data-dismiss="modal"
+                                                            type="button"><span aria-hidden="true">&times;</span></button>
+                                                </div>
+                                                <div class="modal-body">
+                                                    <form action="#">
+                                                        <c:choose>
+                                                            <c:when test="#{setting.valueType == BigDecimal.class.getName()}">
+                                                                <pre>BigDecimal</pre>
+                                                            </c:when>
+                                                            <c:when test="#{setting.valueType == Boolean.class.getName()}">
+                                                                <pre>Boolean</pre>
+                                                            </c:when>
+                                                            <c:when test="#{setting.valueType == Double.class.getName()}">
+                                                                <pre>Double</pre>
+                                                            </c:when>
+                                                            <c:when test="#{setting.valueType == Integer.class.getName()}">
+                                                                <pre>Integer</pre>
+                                                            </c:when>
+                                                            <c:when test="#{setting.valueType == "int"}">
+                                                                <pre>int</pre>
+                                                            </c:when>
+                                                            <c:when test="#{setting.valueType == List.class.getName()}">
+                                                                <pre>List</pre>
+                                                            </c:when>
+                                                            <c:when test="#{setting.valueType == org.libreccm.l10n.LocalizedString.class.getName()}">
+                                                                <pre>LocalizedString</pre>
+                                                            </c:when>
+                                                            <c:when test="#{setting.valueType == Set.class.getName()}">
+                                                                <pre>Set</pre>
+                                                            </c:when>
+                                                            <c:when test="#{setting.valueType == String.class.getName()}">
+                                                                <pre>String</pre>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <p>
+                                                                    #{AdminMessages.getMessage('configuration.settings.setting.dialog.unsupported_type', [setting.valueType])}
+                                                                </p>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                    </form>
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <button class="btn btn-danger"
+                                                            data-dismiss="modal"
+                                                            type="button">
+                                                        #{AdminMessages['configuration.settings.setting.dialog.close']}
+                                                    </button>
+                                                    <button class="btn btn-success" 
+                                                            data-dismiss="modal"
+                                                            type="button">
+                                                        #{AdminMessages['configuration.settings.setting.dialog.save']}
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </td>
                                 <td>
                                     <button class="btn btn-danger" 
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index e18837fce..0ab64960d 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -221,3 +221,7 @@ configuration.settings.table.actions.reset=Reset
 configuration.settings.setting.info.label=Setting {0} Info
 configuration.settings.setting.info.close=Close
 configuration.settings.setting.info.dismiss=OK
+configuration.settings.setting.dialog.title=Edit setting {0}
+configuration.settings.setting.dialog.close=Cancel
+configuration.settings.setting.dialog.save=Save
+configuration.settings.setting.dialog.unsupported_type=Sorry, settings of type "{0}" are not supported yet.
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 0c917d5f8..6a90efbca 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -221,3 +221,7 @@ configuration.settings.table.actions.reset=Zur\u00fccksetzen
 configuration.settings.setting.info.label=Setting {0} Info
 configuration.settings.setting.info.close=Schlie\u00dfen
 configuration.settings.setting.info.dismiss=OK
+configuration.settings.setting.dialog.title=Einstellung {0} bearbeiten
+configuration.settings.setting.dialog.close=Abbrechen
+configuration.settings.setting.dialog.save=Speichern
+configuration.settings.setting.dialog.unsupported_type=Leider werden Einstellunge vom Typ "{0}" noch nicht unterst\u00fctzt.

From 384062440356dc50899d6a9f5673367b98c47358 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 3 Nov 2020 14:39:04 +0100
Subject: [PATCH 32/93] SettingsController endpoint for updating setting values

---
 .../configuration/SettingsController.java     | 365 +++++++++++++++++-
 .../configuration-class-not-found.xhtml       |  29 ++
 .../configuration/invalid-setting-value.xhtml |  31 ++
 .../configuration/setting-not-found.xhtml     |  31 ++
 .../unsupported-setting-type.xhtml            |  30 ++
 .../org/libreccm/ui/AdminBundle.properties    |   8 +
 .../org/libreccm/ui/AdminBundle_de.properties |   8 +
 7 files changed, 483 insertions(+), 19 deletions(-)
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/invalid-setting-value.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/unsupported-setting-type.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
index c6ff18788..402754aa5 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
@@ -18,25 +18,34 @@
  */
 package org.libreccm.ui.admin.configuration;
 
+import org.libreccm.configuration.AbstractSetting;
 import org.libreccm.configuration.ConfigurationInfo;
 import org.libreccm.configuration.ConfigurationManager;
 import org.libreccm.configuration.SettingInfo;
+import org.libreccm.configuration.SettingManager;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.l10n.GlobalizationHelper;
+import org.libreccm.l10n.LocalizedString;
 import org.libreccm.l10n.LocalizedTextsUtil;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
+import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
@@ -48,16 +57,19 @@ import javax.ws.rs.PathParam;
 @RequestScoped
 @Path("/configuration/{configurationClass}")
 public class SettingsController {
-    
+
     @Inject
     private ConfigurationManager confManager;
-    
+
     @Inject
     private GlobalizationHelper globalizationHelper;
-    
+
     @Inject
     private Models models;
-    
+
+    @Inject
+    private SettingManager settingManager;
+
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -67,26 +79,27 @@ public class SettingsController {
     ) {
         final Class<?> confClass;
         try {
-        confClass = Class.forName(configurationClass);
-        } catch(ClassNotFoundException ex) {
+            confClass = Class.forName(configurationClass);
+        } catch (ClassNotFoundException ex) {
             models.put("configurationClass", configurationClass);
             return "org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml";
         }
-        
+
         final ConfigurationInfo confInfo = confManager.getConfigurationInfo(
             confClass
         );
-        
-        final LocalizedTextsUtil textUtil = globalizationHelper.getLocalizedTextsUtil(confInfo.getDescBundle());
+
+        final LocalizedTextsUtil textUtil = globalizationHelper
+            .getLocalizedTextsUtil(confInfo.getDescBundle());
         models.put(
-            "confLabel", 
+            "confLabel",
             textUtil.getText(confInfo.getTitleKey())
         );
         models.put(
-            "configurationDesc", 
+            "configurationDesc",
             textUtil.getText(confInfo.getDescKey())
         );
-        
+
         final List<SettingsTableEntry> settings = confInfo
             .getSettings()
             .entrySet()
@@ -95,28 +108,342 @@ public class SettingsController {
             .map(this::buildSettingsTableEntry)
             .sorted()
             .collect(Collectors.toList());
-        
+
         models.put("settings", settings);
-        
+
         return "org/libreccm/ui/admin/configuration/settings.xhtml";
     }
-    
+
     private SettingsTableEntry buildSettingsTableEntry(
         final SettingInfo settingInfo
     ) {
         Objects.requireNonNull(settingInfo);
-        
+
         final LocalizedTextsUtil textsUtil = globalizationHelper
             .getLocalizedTextsUtil(settingInfo.getDescBundle());
-        
+
         final SettingsTableEntry entry = new SettingsTableEntry();
         entry.setName(settingInfo.getName());
         entry.setValueType(settingInfo.getValueType());
         entry.setDefaultValue(settingInfo.getDefaultValue());
         entry.setLabel(textsUtil.getText(settingInfo.getLabelKey()));
         entry.setDescription(textsUtil.getText(settingInfo.getDescKey()));
-        
+
         return entry;
     }
-    
+
+    @POST
+    @Path("/{settingName}")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String updateSettingValue(
+        @PathParam("configurationClass") final String configurationClassName,
+        @PathParam("settingName") final String settingName,
+        @FormParam("settingValue") final String valueParam
+    ) {
+        final Class<?> confClass;
+        try {
+            confClass = Class.forName(configurationClassName);
+        } catch (ClassNotFoundException ex) {
+            models.put("configurationClass", configurationClassName);
+            return "org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml";
+        }
+        final SettingInfo settingInfo = settingManager.getSettingInfo(
+            confClass, settingName
+        );
+
+        final String valueType = settingInfo.getValueType();
+        if (valueType.equals(BigDecimal.class.getName())) {
+            return updateBigDecimalSetting(
+                configurationClassName, settingName, valueType, valueParam
+            );
+        } else if (valueType.equals(Boolean.class.getName())
+                       || valueType.equals("boolean")) {
+            return updateBooleanSetting(
+                configurationClassName, settingName, valueType, valueParam
+            );
+        } else if (valueType.equals(Double.class.getName())
+                       || valueType.equals("double")) {
+            return updateDoubleSetting(
+                configurationClassName, settingName, valueType, valueParam
+            );
+        } else if (valueType.equals(LocalizedString.class.getName())) {
+            return updateLocalizedStringSetting(
+                configurationClassName, settingName, valueType, valueParam
+            );
+        } else if (valueType.equals(Long.class.getName())
+                       || valueType.equals("long")) {
+            return updateLongSetting(
+                configurationClassName, settingName, valueType, valueParam
+            );
+        } else if (valueType.equals(List.class.getName())) {
+            return updateStringListSetting(
+                configurationClassName, settingName, valueType, valueParam
+            );
+        } else if (valueType.equals(Set.class.getName())) {
+            return updateStringListSetting(
+                configurationClassName, settingName, valueType, valueParam
+            );
+        } else if (valueType.equals(String.class.getName())) {
+            return updateStringSetting(
+                configurationClassName, settingName, valueType, valueParam
+            );
+        } else {
+            models.put("configurationClass", configurationClassName);
+            models.put("settingName", settingName);
+            models.put("valueType", valueType);
+            return "org/libreccm/ui/admin/configuration/unsupported-setting-type.xhtml";
+        }
+    }
+
+    private String updateBigDecimalSetting(
+        final String configurationClassName,
+        final String settingName,
+        final String valueType,
+        final String valueParam
+    ) {
+        final BigDecimal value;
+        try {
+            value = new BigDecimal(valueParam);
+        } catch (NumberFormatException ex) {
+            return buildInvalidTypeErrorTarget(
+                configurationClassName,
+                settingName,
+                valueType,
+                valueParam
+            );
+        }
+
+        final AbstractSetting<BigDecimal> setting = settingManager
+            .findSetting(
+                configurationClassName, settingName, BigDecimal.class
+            );
+
+        if (setting == null) {
+            return buildSettingNotFoundErrorTarget(
+                configurationClassName,
+                settingName,
+                valueType
+            );
+        } else {
+            setting.setValue(value);
+            settingManager.saveSetting(setting);
+            return buildRedirectAfterUpdateSettingTarget(
+                configurationClassName
+            );
+        }
+    }
+
+    private String updateBooleanSetting(
+        final String configurationClassName,
+        final String settingName,
+        final String valueType,
+        final String valueParam
+    ) {
+        final Boolean value = Boolean.valueOf(valueParam);
+
+        final AbstractSetting<Boolean> setting = settingManager.findSetting(
+            configurationClassName, settingName, Boolean.class
+        );
+
+        if (setting == null) {
+            return buildSettingNotFoundErrorTarget(
+                configurationClassName, settingName, valueType
+            );
+        } else {
+            setting.setValue(value);
+            settingManager.saveSetting(setting);
+            return buildRedirectAfterUpdateSettingTarget(
+                configurationClassName
+            );
+        }
+    }
+
+    private String updateDoubleSetting(
+        final String configurationClassName,
+        final String settingName,
+        final String valueType,
+        final String valueParam
+    ) {
+        final Double value;
+        try {
+            value = Double.valueOf(valueParam);
+        } catch (NumberFormatException ex) {
+            return buildInvalidTypeErrorTarget(
+                configurationClassName,
+                settingName,
+                valueType,
+                valueParam
+            );
+        }
+
+        final AbstractSetting<Double> setting = settingManager.findSetting(
+            configurationClassName, settingName, Double.class
+        );
+
+        if (setting == null) {
+            return buildSettingNotFoundErrorTarget(
+                configurationClassName, settingName, valueType
+            );
+        } else {
+            setting.setValue(value);
+            settingManager.saveSetting(setting);
+            return buildRedirectAfterUpdateSettingTarget(
+                configurationClassName
+            );
+        }
+    }
+
+    private String updateLocalizedStringSetting(
+        final String configurationClassName,
+        final String settingName,
+        final String valueType,
+        final String valueParam
+    ) {
+        final LocalizedString value = new LocalizedString();
+        final String[] lines = valueParam.split("\n");
+        for (final String line : lines) {
+            final String[] tokens = line.split(":");
+            if (tokens.length != 2) {
+                continue;
+            }
+            final Locale locale = new Locale(tokens[0]);
+            final String localeValue = tokens[1];
+            value.addValue(locale, localeValue);
+        }
+
+        final AbstractSetting<LocalizedString> setting = settingManager
+            .findSetting(
+                configurationClassName, settingName, LocalizedString.class
+            );
+
+        if (setting == null) {
+            return buildSettingNotFoundErrorTarget(
+                configurationClassName, settingName, valueType
+            );
+        } else {
+            setting.setValue(value);
+            settingManager.saveSetting(setting);
+            return buildRedirectAfterUpdateSettingTarget(
+                configurationClassName
+            );
+        }
+    }
+
+    private String updateLongSetting(
+        final String configurationClassName,
+        final String settingName,
+        final String valueType,
+        final String valueParam
+    ) {
+        final Long value;
+        try {
+            value = Long.valueOf(valueParam, 10);
+        } catch (NumberFormatException ex) {
+            return buildInvalidTypeErrorTarget(
+                configurationClassName,
+                settingName,
+                valueType,
+                valueParam
+            );
+        }
+
+        final AbstractSetting<Long> setting = settingManager.findSetting(
+            configurationClassName, settingName, Long.class
+        );
+
+        if (setting == null) {
+            return buildSettingNotFoundErrorTarget(
+                configurationClassName, settingName, valueType
+            );
+        } else {
+            setting.setValue(value);
+            settingManager.saveSetting(setting);
+            return buildRedirectAfterUpdateSettingTarget(
+                configurationClassName
+            );
+        }
+    }
+
+    private String updateStringListSetting(
+        final String configurationClassName,
+        final String settingName,
+        final String valueType,
+        final String valueParam
+    ) {
+        final String[] tokens = valueParam.split(",");
+        final List<String> value = Arrays.asList(tokens);
+
+        final AbstractSetting<List> setting = settingManager.findSetting(
+            configurationClassName, settingName, List.class
+        );
+
+        if (setting == null) {
+            return buildSettingNotFoundErrorTarget(
+                configurationClassName, settingName, valueType
+            );
+        } else {
+            setting.setValue(value);
+            settingManager.saveSetting(setting);
+            return buildRedirectAfterUpdateSettingTarget(
+                configurationClassName
+            );
+        }
+    }
+
+    private String updateStringSetting(
+        final String configurationClassName,
+        final String settingName,
+        final String valueType,
+        final String valueParam
+    ) {
+        final AbstractSetting<String> setting = settingManager.findSetting(
+            configurationClassName, settingName, String.class
+        );
+
+        if (setting == null) {
+            return buildSettingNotFoundErrorTarget(
+                configurationClassName, settingName, valueType
+            );
+        } else {
+            setting.setValue(valueParam);
+            settingManager.saveSetting(setting);
+            return buildRedirectAfterUpdateSettingTarget(
+                configurationClassName
+            );
+        }
+    }
+
+    private String buildInvalidTypeErrorTarget(
+        final String configurationClassName,
+        final String settingName,
+        final String valueType,
+        final String valueParam
+    ) {
+        models.put("configurationClass", configurationClassName);
+        models.put("settingName", settingName);
+        models.put("valueType", valueType);
+        models.put("valueParam", valueParam);
+        return "org/libreccm/ui/admin/configuration/invalid-setting-value.xhtml";
+    }
+
+    private String buildSettingNotFoundErrorTarget(
+        final String configurationClassName,
+        final String settingName,
+        final String valueType
+    ) {
+        models.put("configurationClass", configurationClassName);
+        models.put("settingName", settingName);
+        models.put("valueType", valueType);
+        return "org/libreccm/ui/admin/configuration/setting-not-found.xhtml";
+    }
+
+    private String buildRedirectAfterUpdateSettingTarget(
+        final String configurationClassName
+    ) {
+        return String.format(
+            "redirect:configuration/%s", configurationClassName
+        );
+    }
+
 }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml
new file mode 100644
index 000000000..2ddf557dc
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="configuration" />
+        <ui:param name="title"
+                  value="#{AdminMessages('configuration.class.not_found.title')}" />
+
+        <ui:define name="breadcrumb">
+            <ui:define name="breadcrumb">
+                <li class="breadcrumb-item active">
+                    #{AdminMessages['configuration.label']}
+                </li>
+            </ui:define>
+        </ui:define>
+
+        <ui:define name="panel">
+            <div class="alert alert-warning" role="alert">
+                #{AdminMessages.getMessage('configuration.class.not_found.message', [configurationClass])}
+            </div>
+        </ui:define>
+
+    </ui:composition>
+
+
+</html>
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/invalid-setting-value.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/invalid-setting-value.xhtml
new file mode 100644
index 000000000..9488ff48d
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/invalid-setting-value.xhtml
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="configuration" />
+        <ui:param name="title"
+                  value="#{AdminMessages('configuration.setting.invalid_type.title')}" />
+
+        <ui:define name="breadcrumb">
+            <ui:define name="breadcrumb">
+                <li class="breadcrumb-item active">
+                    #{AdminMessages['configuration.label']}
+                </li>
+            </ui:define>
+        </ui:define>
+
+        <ui:define name="panel">
+            <div class="alert alert-warning" role="alert">
+                #{AdminMessages.getMessage('configuration.setting.invalid_type.message', [configurationClass, settingName, valueType, valueParam])}
+            </div>
+        </ui:define>
+
+    </ui:composition>
+
+
+</html>
+
+
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
new file mode 100644
index 000000000..99de853f0
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="configuration" />
+        <ui:param name="title"
+                  value="#{AdminMessages('configuration.setting.not_found.title')}" />
+
+        <ui:define name="breadcrumb">
+            <ui:define name="breadcrumb">
+                <li class="breadcrumb-item active">
+                    #{AdminMessages['configuration.label']}
+                </li>
+            </ui:define>
+        </ui:define>
+
+        <ui:define name="panel">
+            <div class="alert alert-warning" role="alert">
+                #{AdminMessages.getMessage('configuration.setting.not_found.message', [configurationClass, settingName, valueType])}
+            </div>
+        </ui:define>
+
+    </ui:composition>
+
+
+</html>
+
+
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/unsupported-setting-type.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/unsupported-setting-type.xhtml
new file mode 100644
index 000000000..e59cb77ba
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/unsupported-setting-type.xhtml
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="configuration" />
+        <ui:param name="title"
+                  value="#{AdminMessages('configuration.setting.type_unsupported.title')}" />
+
+        <ui:define name="breadcrumb">
+            <ui:define name="breadcrumb">
+                <li class="breadcrumb-item active">
+                    #{AdminMessages['configuration.label']}
+                </li>
+            </ui:define>
+        </ui:define>
+
+        <ui:define name="panel">
+            <div class="alert alert-warning" role="alert">
+                #{AdminMessages.getMessage('configuration.setting.type_unsupported.message', [configurationClass, settingName, valueType])}
+            </div>
+        </ui:define>
+
+    </ui:composition>
+
+
+</html>
+
+
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 0ab64960d..fb8049b67 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -225,3 +225,11 @@ configuration.settings.setting.dialog.title=Edit setting {0}
 configuration.settings.setting.dialog.close=Cancel
 configuration.settings.setting.dialog.save=Save
 configuration.settings.setting.dialog.unsupported_type=Sorry, settings of type "{0}" are not supported yet.
+configuration.class.not_found.title=Configuration class not found
+configuration.class.not_found.message=Configuration class {0} not found
+configuration.setting.type_unsupported.title=Unsupported type of setting
+configuration.setting.type_unsupported.message=Type {2} of setting {1} from configuration class {0} is not supported
+configuration.setting.invalid_type.title=Invalid type of value
+configuration.setting.invalid_type.message=Setting {1} of configuration class {0} is of type {2} but the value {3} can be converted into this type
+configuration.setting.not_found.title=Setting not found
+configuration.setting.not_found.message=Setting {1} of type {2} not found in configuration class {0}
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 6a90efbca..60400040e 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -225,3 +225,11 @@ configuration.settings.setting.dialog.title=Einstellung {0} bearbeiten
 configuration.settings.setting.dialog.close=Abbrechen
 configuration.settings.setting.dialog.save=Speichern
 configuration.settings.setting.dialog.unsupported_type=Leider werden Einstellunge vom Typ "{0}" noch nicht unterst\u00fctzt.
+configuration.class.not_found.title=Konfiguration nicht gefunden
+configuration.class.not_found.message=Konfiguration {0} nicht gefunden
+configuration.setting.type_unsupported.title=Typ der Einstellung nicht unterst\u00fctzt
+configuration.setting.type_unsupported.message=Einstellung {1} aus Konfiguration {0} ist vom Typ {3}, dieser wird aber nicht unterst\u00fctzt
+configuration.setting.invalid_type.title=Invalid type of value
+configuration.setting.invalid_type.message=Einstellung {1} der Konfigurations-Klasse {0} ist vom Typ {2}, der angegebene Wert {3} kann aber nicht in diesen Typ konvertiert werden
+configuration.setting.not_found.title=Einstellung nicht gefunden
+configuration.setting.not_found.message=Keine Einstellung {1} vom Typ {3} in Konfiguration {0} gefunden

From 8092a5cc3551c76c4bfc78d01839a93faa5c95f2 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 4 Nov 2020 21:05:51 +0100
Subject: [PATCH 33/93] Settings dialog

---
 .../configuration/SettingsController.java     | 13 +++
 .../configuration/setting-not-found.xhtml     |  2 +-
 .../ui/admin/configuration/settings.xhtml     | 98 +++++++++++--------
 .../org/libreccm/ui/AdminBundle.properties    |  1 +
 .../org/libreccm/ui/AdminBundle_de.properties |  1 +
 5 files changed, 74 insertions(+), 41 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
index 402754aa5..bf7008af2 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
@@ -109,7 +109,20 @@ public class SettingsController {
             .sorted()
             .collect(Collectors.toList());
 
+        models.put("configurationClass", configurationClass);
+        
         models.put("settings", settings);
+        
+        models.put("BigDecimalClassName", BigDecimal.class.getName());
+        models.put("BooleanClassName", Boolean.class.getName());
+        models.put("DoubleClassName", Double.class.getName());
+        models.put("FloatClassName", Float.class.getName());
+        models.put("IntegerClassName", Integer.class.getName());
+        models.put("ListClassName", List.class.getName());
+        models.put("LongClassName", Long.class.getName());
+        models.put("LocalizedStringClassName", LocalizedString.class.getName());
+        models.put("SetClassName", Set.class.getName());
+        models.put("StringClassName", String.class.getName());
 
         return "org/libreccm/ui/admin/configuration/settings.xhtml";
     }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
index 99de853f0..a686c94f9 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
@@ -6,7 +6,7 @@
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
         <ui:param name="activePage" value="configuration" />
         <ui:param name="title"
-                  value="#{AdminMessages('configuration.setting.not_found.title')}" />
+                  value="#{AdminMessages['configuration.setting.not_found.title']}" />
 
         <ui:define name="breadcrumb">
             <ui:define name="breadcrumb">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
index 0e707a1b9..6687c1488 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
@@ -132,7 +132,9 @@
                                          id="setting-#{setting.name}-edit-dialog"
                                          tabindex="-1">
                                         <div class="modal-dialog">
-                                            <div class="modal-content">
+                                            <form action="#{mvc.uri('SettingsController#updateSettingValue', {'configurationClass': configurationClass, 'settingName': setting.name})}"
+                                                  class="modal-content"
+                                                  method="post">
                                                 <div class="modal-header">
                                                     <h2 class="model-title"
                                                         id="setting-#{setting.name}-edit-dialog">
@@ -144,42 +146,59 @@
                                                             type="button"><span aria-hidden="true">&times;</span></button>
                                                 </div>
                                                 <div class="modal-body">
-                                                    <form action="#">
-                                                        <c:choose>
-                                                            <c:when test="#{setting.valueType == BigDecimal.class.getName()}">
-                                                                <pre>BigDecimal</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == Boolean.class.getName()}">
-                                                                <pre>Boolean</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == Double.class.getName()}">
-                                                                <pre>Double</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == Integer.class.getName()}">
-                                                                <pre>Integer</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == "int"}">
-                                                                <pre>int</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == List.class.getName()}">
-                                                                <pre>List</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == org.libreccm.l10n.LocalizedString.class.getName()}">
-                                                                <pre>LocalizedString</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == Set.class.getName()}">
-                                                                <pre>Set</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == String.class.getName()}">
-                                                                <pre>String</pre>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <p>
-                                                                    #{AdminMessages.getMessage('configuration.settings.setting.dialog.unsupported_type', [setting.valueType])}
-                                                                </p>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </form>
+                                                    <c:choose>
+                                                        <c:when test="#{setting.valueType.equals(BigDecimalClassName)}">
+                                                            <pre>BigDecimal</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(BooleanClassName)}">
+                                                            <div class="form-group form-check">
+                                                                <input aria-describedby="#{setting.name}-setting-value-help"
+                                                                       class="form-check-input"
+                                                                       id="#{setting.name}-setting-value"
+                                                                       name="settingValue"
+                                                                       type="checkbox" />
+                                                                <label class="form-check-label"
+                                                                       for="#{setting.name}-setting-value">
+                                                                    #{AdminMessages['configuration.settings.setting.dialog.value.label']}
+                                                                </label>
+                                                                <small class="form-text text-muted"
+                                                                       id="#{setting.name}-setting-value-help">
+                                                                    #{setting.description}
+                                                                </small>
+                                                            </div>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(DoubleClassName)}">
+                                                            <pre>Double</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(IntegerClassName)}">
+                                                            <pre>Integer</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals('int')}">
+                                                            <pre>int</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(ListClassName)}">
+                                                            <pre>List</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(LocalizedStringClassName)}">
+                                                            <pre>LocalizedString</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(SetClassName)}">
+                                                            <pre>Set</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(StringClassName)}">
+                                                            <pre>String</pre>
+                                                        </c:when>
+                                                        <c:otherwise>
+                                                            <p>
+                                                                #{AdminMessages.getMessage('configuration.settings.setting.dialog.unsupported_type', [setting.valueType])}
+                                                            </p>
+                                                            <pre>
+                                                                    setting.valueType: #{setting.valueType}
+                                                                    Boolean: #{BooleanClassName}
+                                                                    LocalizedString: #{LocalizedStringClassName}
+                                                            </pre>
+                                                        </c:otherwise>
+                                                    </c:choose>
                                                 </div>
                                                 <div class="modal-footer">
                                                     <button class="btn btn-danger"
@@ -188,12 +207,11 @@
                                                         #{AdminMessages['configuration.settings.setting.dialog.close']}
                                                     </button>
                                                     <button class="btn btn-success" 
-                                                            data-dismiss="modal"
-                                                            type="button">
+                                                            type="submit">
                                                         #{AdminMessages['configuration.settings.setting.dialog.save']}
                                                     </button>
                                                 </div>
-                                            </div>
+                                            </form>
                                         </div>
                                     </div>
                                 </td>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index fb8049b67..151739c4b 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -233,3 +233,4 @@ configuration.setting.invalid_type.title=Invalid type of value
 configuration.setting.invalid_type.message=Setting {1} of configuration class {0} is of type {2} but the value {3} can be converted into this type
 configuration.setting.not_found.title=Setting not found
 configuration.setting.not_found.message=Setting {1} of type {2} not found in configuration class {0}
+configuration.settings.setting.dialog.value.label=Value
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 60400040e..c23c2fb8c 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -233,3 +233,4 @@ configuration.setting.invalid_type.title=Invalid type of value
 configuration.setting.invalid_type.message=Einstellung {1} der Konfigurations-Klasse {0} ist vom Typ {2}, der angegebene Wert {3} kann aber nicht in diesen Typ konvertiert werden
 configuration.setting.not_found.title=Einstellung nicht gefunden
 configuration.setting.not_found.message=Keine Einstellung {1} vom Typ {3} in Konfiguration {0} gefunden
+configuration.settings.setting.dialog.value.label=Wert

From b5a48b71f5d90ee811c7d550974fcd73fdffae34 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 5 Nov 2020 21:30:42 +0100
Subject: [PATCH 34/93] Admin UI for editing configuration settings (not
 finished yet)

---
 .../configuration/SettingsController.java     | 331 +++++++++++-------
 .../configuration-class-not-found.xhtml       |   2 +-
 .../failed-to-update-setting.xhtml            |  32 ++
 .../configuration/invalid-setting-value.xhtml |   2 +-
 .../configuration/setting-not-found.xhtml     |   2 +-
 .../ui/admin/configuration/settings.xhtml     |  47 ++-
 .../unsupported-setting-type.xhtml            |   2 +-
 .../org/libreccm/ui/AdminBundle.properties    |   2 +
 .../org/libreccm/ui/AdminBundle_de.properties |   4 +-
 9 files changed, 289 insertions(+), 135 deletions(-)
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/failed-to-update-setting.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
index bf7008af2..7c5a5a879 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
@@ -18,6 +18,8 @@
  */
 package org.libreccm.ui.admin.configuration;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.libreccm.configuration.AbstractSetting;
 import org.libreccm.configuration.ConfigurationInfo;
 import org.libreccm.configuration.ConfigurationManager;
@@ -30,6 +32,7 @@ import org.libreccm.l10n.LocalizedTextsUtil;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
+import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
@@ -43,6 +46,7 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
+import javax.transaction.Transactional;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -58,6 +62,10 @@ import javax.ws.rs.PathParam;
 @Path("/configuration/{configurationClass}")
 public class SettingsController {
 
+    private static final Logger LOGGER = LogManager.getLogger(
+        SettingsController.class
+    );
+
     @Inject
     private ConfigurationManager confManager;
 
@@ -72,6 +80,7 @@ public class SettingsController {
 
     @GET
     @Path("/")
+    @Transactional(Transactional.TxType.REQUIRED)
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String showSettings(
@@ -100,19 +109,22 @@ public class SettingsController {
             textUtil.getText(confInfo.getDescKey())
         );
 
+        final Object configuration = confManager.findConfiguration(confClass);
+
         final List<SettingsTableEntry> settings = confInfo
             .getSettings()
             .entrySet()
             .stream()
             .map(Map.Entry::getValue)
-            .map(this::buildSettingsTableEntry)
+            .map(settingInfo -> buildSettingsTableEntry(settingInfo,
+                                                        configuration))
             .sorted()
             .collect(Collectors.toList());
 
         models.put("configurationClass", configurationClass);
-        
+
         models.put("settings", settings);
-        
+
         models.put("BigDecimalClassName", BigDecimal.class.getName());
         models.put("BooleanClassName", Boolean.class.getName());
         models.put("DoubleClassName", Double.class.getName());
@@ -123,20 +135,64 @@ public class SettingsController {
         models.put("LocalizedStringClassName", LocalizedString.class.getName());
         models.put("SetClassName", Set.class.getName());
         models.put("StringClassName", String.class.getName());
+        
+        models.put("IntegerMaxValue", Integer.toString(Integer.MAX_VALUE));
+        models.put("IntegerMinValue", Integer.toString(Integer.MIN_VALUE));
+        models.put("LongMaxValue", Long.toString(Long.MAX_VALUE));
+        models.put("LongMinValue", Long.toString(Long.MIN_VALUE));
+        models.put("DoubleMaxValue", Double.toString(Double.MAX_VALUE));
+        models.put("DoubleMinValue", Double.toString(Double.MIN_VALUE));
 
         return "org/libreccm/ui/admin/configuration/settings.xhtml";
     }
 
+    @Transactional(Transactional.TxType.REQUIRED)
     private SettingsTableEntry buildSettingsTableEntry(
-        final SettingInfo settingInfo
+        final SettingInfo settingInfo,
+        final Object configuration
     ) {
         Objects.requireNonNull(settingInfo);
+        Objects.requireNonNull(configuration);
 
         final LocalizedTextsUtil textsUtil = globalizationHelper
             .getLocalizedTextsUtil(settingInfo.getDescBundle());
 
+        String value;
+        try {
+            final Field field = configuration
+                .getClass()
+                .getDeclaredField(settingInfo.getName());
+            field.setAccessible(true);
+            if (field.get(configuration) instanceof LocalizedString) {
+                final LocalizedString localizedStr = (LocalizedString) field
+                    .get(configuration);
+                value = localizedStr
+                    .getValues()
+                    .entrySet()
+                    .stream()
+                    .map(
+                        entry -> String.format(
+                            "%s: %s",
+                            entry.getKey().toString(), entry.getValue()
+                        )
+                    )
+                    .sorted()
+                    .collect(Collectors.joining(", "));
+            } else {
+                value = Objects.toString(field.get(configuration));
+            }
+        } catch (NoSuchFieldException | IllegalAccessException | SecurityException ex) {
+            LOGGER.error(
+                "Failed to get value for field {} of configuration {}.",
+                settingInfo.getName(),
+                configuration.getClass().getName()
+            );
+            LOGGER.error(ex);
+            value = "?err?";
+        }
         final SettingsTableEntry entry = new SettingsTableEntry();
         entry.setName(settingInfo.getName());
+        entry.setValue(value);
         entry.setValueType(settingInfo.getValueType());
         entry.setDefaultValue(settingInfo.getDefaultValue());
         entry.setLabel(textsUtil.getText(settingInfo.getLabelKey()));
@@ -147,12 +203,16 @@ public class SettingsController {
 
     @POST
     @Path("/{settingName}")
+    @Transactional(Transactional.TxType.REQUIRED)
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String updateSettingValue(
-        @PathParam("configurationClass") final String configurationClassName,
-        @PathParam("settingName") final String settingName,
-        @FormParam("settingValue") final String valueParam
+        @PathParam("configurationClass")
+        final String configurationClassName,
+        @PathParam("settingName")
+        final String settingName,
+        @FormParam("settingValue")
+        final String valueParam
     ) {
         final Class<?> confClass;
         try {
@@ -161,6 +221,7 @@ public class SettingsController {
             models.put("configurationClass", configurationClassName);
             return "org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml";
         }
+        final Object conf = confManager.findConfiguration(confClass);
         final SettingInfo settingInfo = settingManager.getSettingInfo(
             confClass, settingName
         );
@@ -168,38 +229,79 @@ public class SettingsController {
         final String valueType = settingInfo.getValueType();
         if (valueType.equals(BigDecimal.class.getName())) {
             return updateBigDecimalSetting(
-                configurationClassName, settingName, valueType, valueParam
+                configurationClassName,
+                confClass,
+                conf,
+                settingName,
+                valueType,
+                valueParam
             );
         } else if (valueType.equals(Boolean.class.getName())
                        || valueType.equals("boolean")) {
+            final boolean value = valueParam != null;
             return updateBooleanSetting(
-                configurationClassName, settingName, valueType, valueParam
+                configurationClassName,
+                confClass,
+                conf,
+                settingName,
+                valueType,
+                value
             );
         } else if (valueType.equals(Double.class.getName())
                        || valueType.equals("double")) {
             return updateDoubleSetting(
-                configurationClassName, settingName, valueType, valueParam
+                configurationClassName,
+                confClass,
+                conf,
+                settingName,
+                valueType,
+                valueParam
             );
         } else if (valueType.equals(LocalizedString.class.getName())) {
             return updateLocalizedStringSetting(
-                configurationClassName, settingName, valueType, valueParam
+                configurationClassName,
+                confClass,
+                conf,
+                settingName,
+                valueType,
+                valueParam
             );
         } else if (valueType.equals(Long.class.getName())
                        || valueType.equals("long")) {
             return updateLongSetting(
-                configurationClassName, settingName, valueType, valueParam
+                configurationClassName,
+                confClass,
+                conf,
+                settingName,
+                valueType,
+                valueParam
             );
         } else if (valueType.equals(List.class.getName())) {
             return updateStringListSetting(
-                configurationClassName, settingName, valueType, valueParam
+                configurationClassName,
+                confClass,
+                conf,
+                settingName,
+                valueType,
+                valueParam
             );
         } else if (valueType.equals(Set.class.getName())) {
             return updateStringListSetting(
-                configurationClassName, settingName, valueType, valueParam
+                configurationClassName,
+                confClass,
+                conf,
+                settingName,
+                valueType,
+                valueParam
             );
         } else if (valueType.equals(String.class.getName())) {
             return updateStringSetting(
-                configurationClassName, settingName, valueType, valueParam
+                configurationClassName,
+                confClass,
+                conf,
+                settingName,
+                valueType,
+                valueParam
             );
         } else {
             models.put("configurationClass", configurationClassName);
@@ -211,6 +313,8 @@ public class SettingsController {
 
     private String updateBigDecimalSetting(
         final String configurationClassName,
+        final Class<?> configurationClass,
+        final Object configuration,
         final String settingName,
         final String valueType,
         final String valueParam
@@ -226,54 +330,38 @@ public class SettingsController {
                 valueParam
             );
         }
-
-        final AbstractSetting<BigDecimal> setting = settingManager
-            .findSetting(
-                configurationClassName, settingName, BigDecimal.class
-            );
-
-        if (setting == null) {
-            return buildSettingNotFoundErrorTarget(
-                configurationClassName,
-                settingName,
-                valueType
-            );
-        } else {
-            setting.setValue(value);
-            settingManager.saveSetting(setting);
-            return buildRedirectAfterUpdateSettingTarget(
-                configurationClassName
-            );
-        }
+        return updateSetting(
+            configurationClassName,
+            configurationClass,
+            configuration,
+            settingName,
+            valueType,
+            value
+        );
     }
 
     private String updateBooleanSetting(
         final String configurationClassName,
+        final Class<?> configurationClass,
+        final Object configuration,
         final String settingName,
         final String valueType,
-        final String valueParam
+        final boolean value
     ) {
-        final Boolean value = Boolean.valueOf(valueParam);
-
-        final AbstractSetting<Boolean> setting = settingManager.findSetting(
-            configurationClassName, settingName, Boolean.class
+        return updateSetting(
+            configurationClassName,
+            configurationClass,
+            configuration,
+            settingName,
+            valueType,
+            value
         );
-
-        if (setting == null) {
-            return buildSettingNotFoundErrorTarget(
-                configurationClassName, settingName, valueType
-            );
-        } else {
-            setting.setValue(value);
-            settingManager.saveSetting(setting);
-            return buildRedirectAfterUpdateSettingTarget(
-                configurationClassName
-            );
-        }
     }
 
     private String updateDoubleSetting(
         final String configurationClassName,
+        final Class<?> configurationClass,
+        final Object configuration,
         final String settingName,
         final String valueType,
         final String valueParam
@@ -289,26 +377,20 @@ public class SettingsController {
                 valueParam
             );
         }
-
-        final AbstractSetting<Double> setting = settingManager.findSetting(
-            configurationClassName, settingName, Double.class
+        return updateSetting(
+            configurationClassName,
+            configurationClass,
+            configuration,
+            settingName,
+            valueType,
+            value
         );
-
-        if (setting == null) {
-            return buildSettingNotFoundErrorTarget(
-                configurationClassName, settingName, valueType
-            );
-        } else {
-            setting.setValue(value);
-            settingManager.saveSetting(setting);
-            return buildRedirectAfterUpdateSettingTarget(
-                configurationClassName
-            );
-        }
     }
 
     private String updateLocalizedStringSetting(
         final String configurationClassName,
+        final Class<?> configurationClass,
+        final Object configuration,
         final String settingName,
         final String valueType,
         final String valueParam
@@ -324,27 +406,20 @@ public class SettingsController {
             final String localeValue = tokens[1];
             value.addValue(locale, localeValue);
         }
-
-        final AbstractSetting<LocalizedString> setting = settingManager
-            .findSetting(
-                configurationClassName, settingName, LocalizedString.class
-            );
-
-        if (setting == null) {
-            return buildSettingNotFoundErrorTarget(
-                configurationClassName, settingName, valueType
-            );
-        } else {
-            setting.setValue(value);
-            settingManager.saveSetting(setting);
-            return buildRedirectAfterUpdateSettingTarget(
-                configurationClassName
-            );
-        }
+        return updateSetting(
+            configurationClassName,
+            configurationClass,
+            configuration,
+            settingName,
+            valueType,
+            value
+        );
     }
 
     private String updateLongSetting(
         final String configurationClassName,
+        final Class<?> configurationClass,
+        final Object configuration,
         final String settingName,
         final String valueType,
         final String valueParam
@@ -360,70 +435,82 @@ public class SettingsController {
                 valueParam
             );
         }
-
-        final AbstractSetting<Long> setting = settingManager.findSetting(
-            configurationClassName, settingName, Long.class
+        return updateSetting(
+            configurationClassName,
+            configurationClass,
+            configuration,
+            settingName,
+            valueType,
+            value
         );
-
-        if (setting == null) {
-            return buildSettingNotFoundErrorTarget(
-                configurationClassName, settingName, valueType
-            );
-        } else {
-            setting.setValue(value);
-            settingManager.saveSetting(setting);
-            return buildRedirectAfterUpdateSettingTarget(
-                configurationClassName
-            );
-        }
     }
 
     private String updateStringListSetting(
         final String configurationClassName,
+        final Class<?> configurationClass,
+        final Object configuration,
         final String settingName,
         final String valueType,
         final String valueParam
     ) {
         final String[] tokens = valueParam.split(",");
         final List<String> value = Arrays.asList(tokens);
-
-        final AbstractSetting<List> setting = settingManager.findSetting(
-            configurationClassName, settingName, List.class
+        return updateSetting(
+            configurationClassName,
+            configurationClass,
+            configuration,
+            settingName,
+            valueType,
+            value
         );
-
-        if (setting == null) {
-            return buildSettingNotFoundErrorTarget(
-                configurationClassName, settingName, valueType
-            );
-        } else {
-            setting.setValue(value);
-            settingManager.saveSetting(setting);
-            return buildRedirectAfterUpdateSettingTarget(
-                configurationClassName
-            );
-        }
     }
 
     private String updateStringSetting(
         final String configurationClassName,
+        final Class<?> configurationClass,
+        final Object configuration,
         final String settingName,
         final String valueType,
-        final String valueParam
+        final String value
     ) {
-        final AbstractSetting<String> setting = settingManager.findSetting(
-            configurationClassName, settingName, String.class
+        return updateSetting(
+            configurationClassName,
+            configurationClass,
+            configuration,
+            settingName,
+            valueType,
+            value
         );
+    }
 
-        if (setting == null) {
-            return buildSettingNotFoundErrorTarget(
-                configurationClassName, settingName, valueType
+    private String updateSetting(
+        final String configurationClassName,
+        final Class<?> configurationClass,
+        final Object configuration,
+        final String settingName,
+        final String valueType,
+        final Object value
+    ) {
+        try {
+            final Field field = configurationClass.getDeclaredField(
+                settingName
             );
-        } else {
-            setting.setValue(valueParam);
-            settingManager.saveSetting(setting);
+            field.setAccessible(true);
+            field.set(configuration, value);
+            confManager.saveConfiguration(configuration);
             return buildRedirectAfterUpdateSettingTarget(
                 configurationClassName
             );
+        } catch (NoSuchFieldException ex) {
+            return buildSettingNotFoundErrorTarget(
+                configurationClassName,
+                settingName,
+                valueType);
+        } catch (SecurityException | IllegalAccessException ex) {
+            LOGGER.error("Failed to update setting.", ex);
+            models.put("configurationClass", configurationClassName);
+            models.put("settingName", settingName);
+            return "org/libreccm/ui/admin/configuration/failed-to-update-setting.xhtml";
         }
     }
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml
index 2ddf557dc..3beb3feca 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml
@@ -16,7 +16,7 @@
             </ui:define>
         </ui:define>
 
-        <ui:define name="panel">
+        <ui:define name="main">
             <div class="alert alert-warning" role="alert">
                 #{AdminMessages.getMessage('configuration.class.not_found.message', [configurationClass])}
             </div>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/failed-to-update-setting.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/failed-to-update-setting.xhtml
new file mode 100644
index 000000000..fbceb64aa
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/failed-to-update-setting.xhtml
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        <ui:param name="activePage" value="configuration" />
+        <ui:param name="title"
+                  value="#{AdminMessages['configuration.setting.failed_to_update.title']}" />
+
+        <ui:define name="breadcrumb">
+            <ui:define name="breadcrumb">
+                <li class="breadcrumb-item active">
+                    #{AdminMessages['configuration.label']}
+                </li>
+            </ui:define>
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="alert alert-warning" role="alert">
+                #{AdminMessages.getMessage('configuration.setting.failed_to_update.message', [configurationClass, settingName])}
+            </div>
+        </ui:define>
+
+    </ui:composition>
+
+
+</html>
+
+
+
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/invalid-setting-value.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/invalid-setting-value.xhtml
index 9488ff48d..797eb5374 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/invalid-setting-value.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/invalid-setting-value.xhtml
@@ -16,7 +16,7 @@
             </ui:define>
         </ui:define>
 
-        <ui:define name="panel">
+        <ui:define name="main">
             <div class="alert alert-warning" role="alert">
                 #{AdminMessages.getMessage('configuration.setting.invalid_type.message', [configurationClass, settingName, valueType, valueParam])}
             </div>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
index a686c94f9..ee11042a2 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
@@ -16,7 +16,7 @@
             </ui:define>
         </ui:define>
 
-        <ui:define name="panel">
+        <ui:define name="main">
             <div class="alert alert-warning" role="alert">
                 #{AdminMessages.getMessage('configuration.setting.not_found.message', [configurationClass, settingName, valueType])}
             </div>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
index 6687c1488..5c244aefa 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
@@ -150,9 +150,10 @@
                                                         <c:when test="#{setting.valueType.equals(BigDecimalClassName)}">
                                                             <pre>BigDecimal</pre>
                                                         </c:when>
-                                                        <c:when test="#{setting.valueType.equals(BooleanClassName)}">
+                                                        <c:when test="#{setting.valueType.equals(BooleanClassName) or setting.valueType.equals('boolean')}">
                                                             <div class="form-group form-check">
                                                                 <input aria-describedby="#{setting.name}-setting-value-help"
+                                                                       checked="#{(setting.value.equals('true') or (setting.value == null and setting.defaultValue.equals('true'))) ? 'checked' : ''}"
                                                                        class="form-check-input"
                                                                        id="#{setting.name}-setting-value"
                                                                        name="settingValue"
@@ -167,14 +168,29 @@
                                                                 </small>
                                                             </div>
                                                         </c:when>
-                                                        <c:when test="#{setting.valueType.equals(DoubleClassName)}">
-                                                            <pre>Double</pre>
+                                                        <c:when test="#{setting.valueType.equals(DoubleClassName) or setting.valueType.equals('double')}">
+                                                            <pre>double</pre>
                                                         </c:when>
-                                                        <c:when test="#{setting.valueType.equals(IntegerClassName)}">
-                                                            <pre>Integer</pre>
-                                                        </c:when>
-                                                        <c:when test="#{setting.valueType.equals('int')}">
-                                                            <pre>int</pre>
+                                                        <c:when test="#{setting.valueType.equals(IntegerClassName) or setting.valueType.equals('int')}">
+                                                            <div class="form-group">
+                                                                <label for="#{setting-name}-setting-value">
+                                                                    #{AdminMessages['configuration.settings.setting.dialog.value.label']}
+                                                                </label>
+                                                                <input aria-describedby="#{setting.name}-setting-value-help"
+                                                                       class="form-control" 
+                                                                       id="#{setting.name}-setting-value"
+                                                                       max="#{IntegerMaxValue}"
+                                                                       min="#{IntegerMinValue}"
+                                                                       name="settingValue"
+                                                                       step="1"
+                                                                       type="number" 
+                                                                       value="#{setting.value}" />
+                                                                <small class="form-text text-muted"
+                                                                       id="#{setting.name}-setting-value-help">
+                                                                    #{setting.description}
+                                                                </small>
+                                                            </div>
+
                                                         </c:when>
                                                         <c:when test="#{setting.valueType.equals(ListClassName)}">
                                                             <pre>List</pre>
@@ -182,6 +198,21 @@
                                                         <c:when test="#{setting.valueType.equals(LocalizedStringClassName)}">
                                                             <pre>LocalizedString</pre>
                                                         </c:when>
+                                                        <c:when test="#{setting.valueType.equals(LongClassName) or setting.valueType.equals('long')}">
+                                                            <div class="form-group">
+                                                               <label for="#{setting-name}-setting-value">
+                                                                    #{AdminMessages['configuration.settings.setting.dialog.value.label']}
+                                                                </label>
+                                                                <input aria-describedby="#{setting.name}-setting-value-help"
+                                                                       class="form-control" 
+                                                                       id="#{setting.name}-setting-value"
+                                                                       name="settingValue"
+                                                                       step="1"
+                                                                       type="number" 
+                                                                       value="#{setting.value}" />
+                                                                
+                                                            </div>
+                                                        </c:when>
                                                         <c:when test="#{setting.valueType.equals(SetClassName)}">
                                                             <pre>Set</pre>
                                                         </c:when>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/unsupported-setting-type.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/unsupported-setting-type.xhtml
index e59cb77ba..a75b13749 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/unsupported-setting-type.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/unsupported-setting-type.xhtml
@@ -16,7 +16,7 @@
             </ui:define>
         </ui:define>
 
-        <ui:define name="panel">
+        <ui:define name="main">
             <div class="alert alert-warning" role="alert">
                 #{AdminMessages.getMessage('configuration.setting.type_unsupported.message', [configurationClass, settingName, valueType])}
             </div>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 151739c4b..fcb595bc5 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -234,3 +234,5 @@ configuration.setting.invalid_type.message=Setting {1} of configuration class {0
 configuration.setting.not_found.title=Setting not found
 configuration.setting.not_found.message=Setting {1} of type {2} not found in configuration class {0}
 configuration.settings.setting.dialog.value.label=Value
+configuration.setting.failed_to_update.title=Failed to update setting
+configuration.setting.failed_to_update.message=Failed to update setting {1} of configuration {0}.
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index c23c2fb8c..80a2c5a45 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -232,5 +232,7 @@ configuration.setting.type_unsupported.message=Einstellung {1} aus Konfiguration
 configuration.setting.invalid_type.title=Invalid type of value
 configuration.setting.invalid_type.message=Einstellung {1} der Konfigurations-Klasse {0} ist vom Typ {2}, der angegebene Wert {3} kann aber nicht in diesen Typ konvertiert werden
 configuration.setting.not_found.title=Einstellung nicht gefunden
-configuration.setting.not_found.message=Keine Einstellung {1} vom Typ {3} in Konfiguration {0} gefunden
+configuration.setting.not_found.message=Keine Einstellung {1} vom Typ {2} in Konfiguration {0} gefunden
 configuration.settings.setting.dialog.value.label=Wert
+configuration.setting.failed_to_update.title=Aktualisieren der Einstellung fehlgeschlagen
+configuration.setting.failed_to_update.message=Aktualisieren der Einstellung {1} in Konfiguration {0} fehlgeschlagen.

From 0650e1a0737d7ca36164efd38cfa7c541d43ebe8 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 7 Nov 2020 17:11:55 +0100
Subject: [PATCH 35/93] CCM Admin UI: Edit configuration settings

---
 .../configuration/SettingManager.java         |  36 ++++-
 .../configuration/SettingsController.java     |  54 ++++++--
 .../ui/admin/configuration/settings.xhtml     | 130 +++++++++++++++---
 3 files changed, 187 insertions(+), 33 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java b/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java
index e528915bf..753850409 100644
--- a/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java
+++ b/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java
@@ -22,18 +22,24 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.util.Strings;
 import org.libreccm.core.CoreConstants;
+import org.libreccm.l10n.LocalizedString;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
+import java.lang.reflect.Constructor;
+
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
 import javax.transaction.Transactional;
+
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -163,9 +169,33 @@ public class SettingManager {
         settingInfo.setValueType(field.getType().getName());
 
         try {
-            final Object conf = configuration.newInstance();
-            settingInfo.setDefaultValue(Objects.toString(field.get(conf)));
-        } catch (InstantiationException | IllegalAccessException ex) {
+            final Constructor<?> constructor = configuration.getConstructor();
+            final Object conf = constructor.newInstance();
+            final Object defaultValueObj = field.get(conf);
+            final String defaultValue;
+            if (defaultValueObj instanceof LocalizedString) {
+                final LocalizedString defaultValueLstr
+                    = (LocalizedString) defaultValueObj;
+                defaultValue = defaultValueLstr
+                    .getValues()
+                    .entrySet()
+                    .stream()
+                    .map(
+                        entry -> String.format(
+                            "%s: %s",
+                            entry.getKey().toString(), entry.getValue()
+                        )
+                    )
+                    .collect(Collectors.joining(", "));
+            } else {
+                defaultValue = Objects.toString(defaultValueObj);
+            }
+            settingInfo.setDefaultValue(defaultValue);
+
+        } catch (NoSuchMethodException
+                 | InstantiationException
+                 | InvocationTargetException
+                 | IllegalAccessException ex) {
             LOGGER.warn(String.format("Failed to create instance of \"%s\" to "
                                           + "get default values.",
                                       configuration.getName()),
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
index 7c5a5a879..e3b06ed17 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
@@ -20,7 +20,6 @@ package org.libreccm.ui.admin.configuration;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.libreccm.configuration.AbstractSetting;
 import org.libreccm.configuration.ConfigurationInfo;
 import org.libreccm.configuration.ConfigurationManager;
 import org.libreccm.configuration.SettingInfo;
@@ -35,6 +34,7 @@ import org.libreccm.security.RequiresPrivilege;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -163,9 +163,15 @@ public class SettingsController {
                 .getClass()
                 .getDeclaredField(settingInfo.getName());
             field.setAccessible(true);
-            if (field.get(configuration) instanceof LocalizedString) {
-                final LocalizedString localizedStr = (LocalizedString) field
-                    .get(configuration);
+            final Object valueObj = field.get(configuration);
+            if (valueObj instanceof List) {
+                @SuppressWarnings("unchecked")
+                final List<String> list = (List<String>) valueObj;
+                value = list
+                    .stream()
+                    .collect(Collectors.joining("\n"));
+            } else if (valueObj instanceof LocalizedString) {
+                final LocalizedString localizedStr = (LocalizedString) valueObj;
                 value = localizedStr
                     .getValues()
                     .entrySet()
@@ -177,9 +183,15 @@ public class SettingsController {
                         )
                     )
                     .sorted()
-                    .collect(Collectors.joining(", "));
+                    .collect(Collectors.joining("\n"));
+            } else if (valueObj instanceof Set) {
+                @SuppressWarnings("unchecked")
+                final Set<String> set = (Set<String>) valueObj;
+                value = set
+                    .stream()
+                    .collect(Collectors.joining("\n"));
             } else {
-                value = Objects.toString(field.get(configuration));
+                value = Objects.toString(valueObj);
             }
         } catch (NoSuchFieldException | IllegalAccessException | SecurityException ex) {
             LOGGER.error(
@@ -286,7 +298,7 @@ public class SettingsController {
                 valueParam
             );
         } else if (valueType.equals(Set.class.getName())) {
-            return updateStringListSetting(
+            return updateStringSetSetting(
                 configurationClassName,
                 confClass,
                 conf,
@@ -403,7 +415,7 @@ public class SettingsController {
                 continue;
             }
             final Locale locale = new Locale(tokens[0]);
-            final String localeValue = tokens[1];
+            final String localeValue = tokens[1].trim();
             value.addValue(locale, localeValue);
         }
         return updateSetting(
@@ -452,9 +464,33 @@ public class SettingsController {
         final String settingName,
         final String valueType,
         final String valueParam
+    ) {
+        final String[] tokens = valueParam.split("\n");
+        final List<String> value = Arrays
+            .asList(tokens)
+            .stream()
+            .map(String::trim)
+            .collect(Collectors.toList());
+        return updateSetting(
+            configurationClassName,
+            configurationClass,
+            configuration,
+            settingName,
+            valueType,
+            value
+        );
+    }
+    
+     private String updateStringSetSetting(
+        final String configurationClassName,
+        final Class<?> configurationClass,
+        final Object configuration,
+        final String settingName,
+        final String valueType,
+        final String valueParam
     ) {
         final String[] tokens = valueParam.split(",");
-        final List<String> value = Arrays.asList(tokens);
+        final Set<String> value = new HashSet<>(Arrays.asList(tokens));
         return updateSetting(
             configurationClassName,
             configurationClass,
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
index 5c244aefa..459258429 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
@@ -57,7 +57,7 @@
                                         </c:when>
                                         <c:otherwise>
                                             <strong>
-                                                #{setting.value}
+                                                <pre>#{setting.value}</pre>
                                             </strong>
                                         </c:otherwise>
                                     </c:choose>
@@ -148,7 +148,22 @@
                                                 <div class="modal-body">
                                                     <c:choose>
                                                         <c:when test="#{setting.valueType.equals(BigDecimalClassName)}">
-                                                            <pre>BigDecimal</pre>
+                                                            <div class="form-group">
+                                                                <label for="#{setting.name}-setting-value">
+                                                                    #{AdminMessages['configuration.settings.setting.dialog.value.label']}
+                                                                </label>
+                                                                <input aria-describedby="#{setting.name}-setting-value-help"
+                                                                       class="form-control" 
+                                                                       id="#{setting.name}-setting-value"
+                                                                       name="settingValue"
+                                                                       step="0.01"
+                                                                       type="number" 
+                                                                       value="#{setting.value}" />
+                                                                <small class="form-text text-muted"
+                                                                       id="#{setting.name}-setting-value-help">
+                                                                    #{setting.description}
+                                                                </small>
+                                                            </div>
                                                         </c:when>
                                                         <c:when test="#{setting.valueType.equals(BooleanClassName) or setting.valueType.equals('boolean')}">
                                                             <div class="form-group form-check">
@@ -169,11 +184,28 @@
                                                             </div>
                                                         </c:when>
                                                         <c:when test="#{setting.valueType.equals(DoubleClassName) or setting.valueType.equals('double')}">
-                                                            <pre>double</pre>
+                                                            <div class="form-group">
+                                                                <label for="#{setting.name}-setting-value">
+                                                                    #{AdminMessages['configuration.settings.setting.dialog.value.label']}
+                                                                </label>
+                                                                <input aria-describedby="#{setting.name}-setting-value-help"
+                                                                       class="form-control" 
+                                                                       id="#{setting.name}-setting-value"
+                                                                       max="#{DoubleMaxValue}"
+                                                                       min="#{DoubleMinValue}"
+                                                                       name="settingValue"
+                                                                       step="0.01"
+                                                                       type="number" 
+                                                                       value="#{setting.value}" />
+                                                                <small class="form-text text-muted"
+                                                                       id="#{setting.name}-setting-value-help">
+                                                                    #{setting.description}
+                                                                </small>
+                                                            </div>
                                                         </c:when>
                                                         <c:when test="#{setting.valueType.equals(IntegerClassName) or setting.valueType.equals('int')}">
                                                             <div class="form-group">
-                                                                <label for="#{setting-name}-setting-value">
+                                                                <label for="#{setting.name}-setting-value">
                                                                     #{AdminMessages['configuration.settings.setting.dialog.value.label']}
                                                                 </label>
                                                                 <input aria-describedby="#{setting.name}-setting-value-help"
@@ -193,41 +225,97 @@
 
                                                         </c:when>
                                                         <c:when test="#{setting.valueType.equals(ListClassName)}">
-                                                            <pre>List</pre>
+                                                            <div class="form-group">
+                                                                <label for="#{setting.name}-setting-value">
+                                                                    #{AdminMessages['configuration.settings.setting.dialog.value.label']}
+                                                                </label>
+                                                                <textarea aria-describedby="#{setting.name}-setting-value-help"
+                                                                          class="form-control"
+                                                                          cols="80"
+                                                                          id="#{setting.name}-setting-value"
+                                                                          name="settingValue"
+                                                                          rows="10">#{setting.value}</textarea>
+                                                                <small class="form-text text-muted"
+                                                                       id="#{setting.name}-setting-value-help">
+                                                                    #{setting.description}
+                                                                </small>
+                                                            </div>
                                                         </c:when>
                                                         <c:when test="#{setting.valueType.equals(LocalizedStringClassName)}">
-                                                            <pre>LocalizedString</pre>
+                                                            <div class="form-group">
+                                                                <label for="#{setting.name}-setting-value">
+                                                                    #{AdminMessages['configuration.settings.setting.dialog.value.label']}
+                                                                </label>
+                                                                <textarea aria-describedby="#{setting.name}-setting-value-help"
+                                                                          class="form-control"
+                                                                          cols="80"
+                                                                          id="#{setting.name}-setting-value"
+                                                                          name="settingValue"
+                                                                          rows="10">#{setting.value}</textarea>
+                                                                <small class="form-text text-muted"
+                                                                       id="#{setting.name}-setting-value-help">
+                                                                    #{setting.description}
+                                                                </small>
+                                                            </div>
                                                         </c:when>
                                                         <c:when test="#{setting.valueType.equals(LongClassName) or setting.valueType.equals('long')}">
                                                             <div class="form-group">
-                                                               <label for="#{setting-name}-setting-value">
+                                                                <label for="#{setting.name}-setting-value">
+                                                                    #{AdminMessages['configuration.settings.setting.dialog.value.label']}
+                                                                </label>
+                                                                <input aria-describedby="#{setting.name}-setting-value-help"
+                                                                       class="form-control" 
+                                                                       id="#{setting.name}-setting-value"
+                                                                       max="#{LongMaxValue}"
+                                                                       min="#{LongMinValue}"
+                                                                       name="settingValue"
+                                                                       step="1"
+                                                                       type="number" 
+                                                                       value="#{setting.value}" />
+                                                                <small class="form-text text-muted"
+                                                                       id="#{setting.name}-setting-value-help">
+                                                                    #{setting.description}
+                                                                </small>
+                                                            </div>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(SetClassName)}">
+                                                            <div class="form-group">
+                                                                <label for="#{setting.name}-setting-value">
+                                                                    #{AdminMessages['configuration.settings.setting.dialog.value.label']}
+                                                                </label>
+                                                                <textarea aria-describedby="#{setting.name}-setting-value-help"
+                                                                          class="form-control"
+                                                                          cols="80"
+                                                                          id="#{setting.name}-setting-value"
+                                                                          name="settingValue"
+                                                                          rows="10">#{setting.value}</textarea>
+                                                                <small class="form-text text-muted"
+                                                                       id="#{setting.name}-setting-value-help">
+                                                                    #{setting.description}
+                                                                </small>
+                                                            </div>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(StringClassName)}">
+                                                            <div class="form-group">
+                                                                <label for="#{setting.name}-setting-value">
                                                                     #{AdminMessages['configuration.settings.setting.dialog.value.label']}
                                                                 </label>
                                                                 <input aria-describedby="#{setting.name}-setting-value-help"
                                                                        class="form-control" 
                                                                        id="#{setting.name}-setting-value"
                                                                        name="settingValue"
-                                                                       step="1"
-                                                                       type="number" 
+                                                                       type="text" 
                                                                        value="#{setting.value}" />
-                                                                
+                                                                <small class="form-text text-muted"
+                                                                       id="#{setting.name}-setting-value-help">
+                                                                    #{setting.description}
+                                                                </small>
                                                             </div>
                                                         </c:when>
-                                                        <c:when test="#{setting.valueType.equals(SetClassName)}">
-                                                            <pre>Set</pre>
-                                                        </c:when>
-                                                        <c:when test="#{setting.valueType.equals(StringClassName)}">
-                                                            <pre>String</pre>
-                                                        </c:when>
                                                         <c:otherwise>
                                                             <p>
                                                                 #{AdminMessages.getMessage('configuration.settings.setting.dialog.unsupported_type', [setting.valueType])}
                                                             </p>
-                                                            <pre>
-                                                                    setting.valueType: #{setting.valueType}
-                                                                    Boolean: #{BooleanClassName}
-                                                                    LocalizedString: #{LocalizedStringClassName}
-                                                            </pre>
                                                         </c:otherwise>
                                                     </c:choose>
                                                 </div>

From 16cc7aedcb62182fa02f1938c37da5cecb5b1feb Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 7 Nov 2020 18:56:07 +0100
Subject: [PATCH 36/93] CCM Admin UI Settings Editor: Resetting to default
 value

---
 .../configuration/SettingManager.java         | 111 ++++++++++++++----
 .../configuration/SettingsController.java     |  42 ++++++-
 .../ui/admin/configuration/settings.xhtml     |  58 +++++++--
 .../org/libreccm/ui/AdminBundle.properties    |   4 +
 .../org/libreccm/ui/AdminBundle_de.properties |   4 +
 5 files changed, 189 insertions(+), 30 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java b/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java
index 753850409..257dc46af 100644
--- a/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java
+++ b/ccm-core/src/main/java/org/libreccm/configuration/SettingManager.java
@@ -39,6 +39,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -112,10 +113,10 @@ public class SettingManager {
     /**
      * Create a {@link SettingInfo} instance for a setting.
      *
-     * @param configuration The configuration class to which the settings
-     *                      belongs.
-     * @param name          The name of the setting for which the
-     *                      {@link SettingInfo} is generated.
+     * @param configurationClass The configuration class to which the settings
+     *                           belongs.
+     * @param name               The name of the setting for which the
+     *                           {@link SettingInfo} is generated.
      *
      * @return The {@link SettingInfo} for the provided configuration class.
      */
@@ -123,28 +124,29 @@ public class SettingManager {
                        "PMD.CyclomaticComplexity",
                        "PMD.StandardCyclomaticComplexity"})
     public SettingInfo getSettingInfo(
-        final Class<?> configuration,
-        final String name) {
-        if (configuration == null) {
+        final Class<?> configurationClass,
+        final String name
+    ) {
+        if (configurationClass == null) {
             throw new IllegalArgumentException("Configuration can't be null");
         }
 
-        if (configuration.getAnnotation(Configuration.class) == null) {
+        if (configurationClass.getAnnotation(Configuration.class) == null) {
             throw new IllegalArgumentException(String.format(
                 "The class \"%s\" of the provided object is not annotated "
                     + "with \"%s\".",
-                configuration.getClass().getName(),
+                configurationClass.getClass().getName(),
                 Configuration.class.getName()));
         }
 
         final Field field;
         try {
-            field = configuration.getDeclaredField(name);
+            field = configurationClass.getDeclaredField(name);
         } catch (SecurityException | NoSuchFieldException ex) {
             LOGGER.warn(String.format(
                 "Failed to generate SettingInfo for field \"%s\" of "
                     + "configuration \"%s\". Ignoring field.",
-                configuration.getClass().getName(),
+                configurationClass.getClass().getName(),
                 name),
                         ex);
             return null;
@@ -169,11 +171,19 @@ public class SettingManager {
         settingInfo.setValueType(field.getType().getName());
 
         try {
-            final Constructor<?> constructor = configuration.getConstructor();
-            final Object conf = constructor.newInstance();
-            final Object defaultValueObj = field.get(conf);
+            final Constructor<?> constructor = configurationClass
+                .getConstructor();
+            final Object configuration = constructor.newInstance();
+            final Object defaultValueObj = field.get(configuration);
             final String defaultValue;
-            if (defaultValueObj instanceof LocalizedString) {
+            if (defaultValueObj instanceof List) {
+                @SuppressWarnings("unchecked")
+                final List<String> defaultValueList
+                    = (List<String>) defaultValueObj;
+                defaultValue = defaultValueList
+                    .stream()
+                    .collect(Collectors.joining("\n"));
+            } else if (defaultValueObj instanceof LocalizedString) {
                 final LocalizedString defaultValueLstr
                     = (LocalizedString) defaultValueObj;
                 defaultValue = defaultValueLstr
@@ -186,24 +196,30 @@ public class SettingManager {
                             entry.getKey().toString(), entry.getValue()
                         )
                     )
-                    .collect(Collectors.joining(", "));
+                    .collect(Collectors.joining("\n"));
+            } else if (defaultValueObj instanceof Set) {
+                @SuppressWarnings("unchecked")
+                final Set<String> defaultValueSet
+                    = (Set<String>) defaultValueObj;
+                defaultValue = defaultValueSet
+                    .stream()
+                    .collect(Collectors.joining("\n"));
             } else {
                 defaultValue = Objects.toString(defaultValueObj);
             }
             settingInfo.setDefaultValue(defaultValue);
-
         } catch (NoSuchMethodException
                  | InstantiationException
                  | InvocationTargetException
                  | IllegalAccessException ex) {
             LOGGER.warn(String.format("Failed to create instance of \"%s\" to "
                                           + "get default values.",
-                                      configuration.getName()),
+                                      configurationClass.getName()),
                         ex);
         }
 
-        settingInfo.setConfClass(configuration.getName());
-        settingInfo.setDescBundle(getDescBundle(configuration));
+        settingInfo.setConfClass(configurationClass.getName());
+        settingInfo.setDescBundle(getDescBundle(configurationClass));
 
         if (Strings.isBlank(settingAnnotation.labelKey())) {
             settingInfo.setLabelKey(String.join(".", field.getName(),
@@ -257,6 +273,61 @@ public class SettingManager {
         }
     }
 
+    public Object getDefaultValue(
+        final Class<?> configurationClass,
+        final String settingName
+    ) {
+        if (configurationClass == null) {
+            throw new IllegalArgumentException("Configuration can't be null");
+        }
+
+        if (configurationClass.getAnnotation(Configuration.class) == null) {
+            throw new IllegalArgumentException(String.format(
+                "The class \"%s\" of the provided object is not annotated "
+                    + "with \"%s\".",
+                configurationClass.getClass().getName(),
+                Configuration.class.getName()));
+        }
+
+        final Field field;
+        try {
+            field = configurationClass.getDeclaredField(settingName);
+        } catch (SecurityException | NoSuchFieldException ex) {
+            LOGGER.warn(String.format(
+                "Failed to generate SettingInfo for field \"%s\" of "
+                    + "configuration \"%s\". Ignoring field.",
+                configurationClass.getClass().getName(),
+                settingName),
+                        ex);
+            return null;
+        }
+
+        //Make the field accessible even if it has a private modifier
+        field.setAccessible(true);
+
+        if (field.getAnnotation(Setting.class) == null) {
+            return null;
+        }
+
+        try {
+            final Constructor<?> constructor = configurationClass
+                .getConstructor();
+            final Object configuration = constructor.newInstance();
+            final Object defaultValueObj = field.get(configuration);
+
+            return defaultValueObj;
+        } catch (NoSuchMethodException
+                 | IllegalAccessException
+                 | InstantiationException
+                 | InvocationTargetException ex) {
+            LOGGER.warn(String.format("Failed to create instance of \"%s\" to "
+                                          + "get default values.",
+                                      configurationClass.getName()),
+                        ex);
+            return null;
+        }
+    }
+
     /**
      * Low level method of saving a setting.
      *
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
index e3b06ed17..68ac0b7bd 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
@@ -135,7 +135,7 @@ public class SettingsController {
         models.put("LocalizedStringClassName", LocalizedString.class.getName());
         models.put("SetClassName", Set.class.getName());
         models.put("StringClassName", String.class.getName());
-        
+
         models.put("IntegerMaxValue", Integer.toString(Integer.MAX_VALUE));
         models.put("IntegerMinValue", Integer.toString(Integer.MIN_VALUE));
         models.put("LongMaxValue", Long.toString(Long.MAX_VALUE));
@@ -323,6 +323,42 @@ public class SettingsController {
         }
     }
 
+    @POST
+    @Path("/{settingName}/reset")
+    @Transactional(Transactional.TxType.REQUIRED)
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String resetSettingValue(
+        @PathParam("configurationClass")
+        final String configurationClassName,
+        @PathParam("settingName")
+        final String settingName,
+        @FormParam("confirmed")
+        final String confirmed
+    ) {
+        if ("true".equals(confirmed)) {
+            final Class<?> configurationClass;
+            try {
+                configurationClass = Class.forName(
+                    configurationClassName
+                );
+            } catch (ClassNotFoundException ex) {
+                models.put("configurationClass", configurationClassName);
+                return "org/libreccm/ui/admin/configuration/configuration-class-not-found.xhtml";
+            }
+            final SettingInfo settingInfo = settingManager.getSettingInfo(
+                configurationClass, settingName
+            );
+            return updateSettingValue(
+                configurationClassName, 
+                settingName, 
+                settingInfo.getDefaultValue()
+            );
+        } else {
+            return buildRedirectAfterUpdateSettingTarget(configurationClassName);
+        }
+    }
+
     private String updateBigDecimalSetting(
         final String configurationClassName,
         final Class<?> configurationClass,
@@ -480,8 +516,8 @@ public class SettingsController {
             value
         );
     }
-    
-     private String updateStringSetSetting(
+
+    private String updateStringSetSetting(
         final String configurationClassName,
         final Class<?> configurationClass,
         final Object configuration,
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
index 459258429..be78558ae 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
@@ -53,16 +53,16 @@
                                 <td>
                                     <c:choose>
                                         <c:when test="#{setting.value == null}">
-                                            <span class="text-muted">#{setting.defaultValue}</span>
+                                            <pre class="text-muted">#{setting.defaultValue}</pre>
                                         </c:when>
                                         <c:otherwise>
-                                            <strong>
-                                                <pre>#{setting.value}</pre>
-                                            </strong>
+                                            <pre>#{setting.value}</pre>
                                         </c:otherwise>
                                     </c:choose>
                                 </td>
-                                <td>#{setting.defaultValue}</td>
+                                <td>
+                                    <pre>#{setting.defaultValue}</pre>
+                                </td>
                                 <td>
                                     <c:if test="#{setting.description.length() > 0}">
                                         <button class="btn btn-info" 
@@ -137,7 +137,7 @@
                                                   method="post">
                                                 <div class="modal-header">
                                                     <h2 class="model-title"
-                                                        id="setting-#{setting.name}-edit-dialog">
+                                                        id="setting-#{setting.name}-edit-dialog-title">
                                                         #{AdminMessages.getMessage('configuration.settings.setting.dialog.title', [setting.label])}
                                                     </h2>
                                                     <button aria-label="#{AdminMessages['configuration.settings.setting.dialog.close']}"
@@ -336,7 +336,9 @@
                                 </td>
                                 <td>
                                     <button class="btn btn-danger" 
-                                            title="#{AdminMessages.getMessage('configuration.settings.table.actions.reset.help', [setting.label])}"
+                                            data-toggle="modal"
+                                            data-target="#setting-#{setting.name}-reset-dialog"
+                                            title="#{AdminMessages.getMessage('configuration.settings.table.actions.reset.help', [setting.label, setting.defaultValue])}"
                                             type="button">
                                         <svg class="bi"
                                              width="1em"
@@ -346,6 +348,48 @@
                                         </svg>
                                         #{AdminMessages['configuration.settings.table.actions.reset']}
                                     </button>
+                                    <div aria-hidden="true"
+                                         aria-labelledby="setting-#{setting.name}-reset-dialog-title"
+                                         class="modal fade"
+                                         data-backdrop="static"
+                                         id="setting-#{setting.name}-reset-dialog"
+                                         tabindex="-1">
+                                        <div class="modal-dialog">
+                                            <form action="#{mvc.uri('SettingsController#resetSettingValue', {'configurationClass': configurationClass, 'settingName': setting.name })}"
+                                                  class="modal-content"
+                                                  method="post">
+                                                <div class="modal-header">
+                                                    <h2 class="modal-title"
+                                                        id="setting-#{setting.name}-reset-dialog-title">
+                                                        #{AdminMessages.getMessage('configuration.settings.setting.reset.title', [setting.label])}
+                                                    </h2>
+                                                    <button aria-label="#{AdminMessages['configuration.settings.setting.reset.close']}"
+                                                            class="close"
+                                                            data-dismiss="modal"
+                                                            type="button"><span aria-hidden="true">&times;</span></button>
+                                                </div>
+                                                <div class="modal-body">
+                                                    <p>
+                                                        #{AdminMessages.getMessage('configuration.settings.setting.reset.confirm', [configuration.name, setting.label, setting.defaultValue])}
+                                                    </p>
+                                                    <input name="confirmed"
+                                                           type="hidden" 
+                                                           value="true" />
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <button class="btn btn-danger"
+                                                            data-dismiss="modal"
+                                                            type="button">
+                                                        #{AdminMessages['configuration.settings.setting.reset.close']}
+                                                    </button>
+                                                    <button class="btn btn-success" 
+                                                            type="submit">
+                                                        #{AdminMessages['configuration.settings.setting.reset.submit']}
+                                                    </button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
                                 </td>
                             </tr>
                         </c:forEach>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index fcb595bc5..9e60c46e0 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -236,3 +236,7 @@ configuration.setting.not_found.message=Setting {1} of type {2} not found in con
 configuration.settings.setting.dialog.value.label=Value
 configuration.setting.failed_to_update.title=Failed to update setting
 configuration.setting.failed_to_update.message=Failed to update setting {1} of configuration {0}.
+configuration.settings.setting.reset.title=Reset setting {0}
+configuration.settings.setting.reset.close=Cancel
+configuration.settings.setting.reset.confirm=Are you sure to set reset setting {1} of configuration {0} to its default value {2}?
+configuration.settings.setting.reset.submit=Reset to default value
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 80a2c5a45..7a051b9ef 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -236,3 +236,7 @@ configuration.setting.not_found.message=Keine Einstellung {1} vom Typ {2} in Kon
 configuration.settings.setting.dialog.value.label=Wert
 configuration.setting.failed_to_update.title=Aktualisieren der Einstellung fehlgeschlagen
 configuration.setting.failed_to_update.message=Aktualisieren der Einstellung {1} in Konfiguration {0} fehlgeschlagen.
+configuration.settings.setting.reset.title=Einstellung {0} zur\u00fccksetzen
+configuration.settings.setting.reset.close=Abbrechen
+configuration.settings.setting.reset.confirm=Sind Sie sicher, dass die die Einstellung {1} in Konfiguration {0} auf ihren Standardwert {2} zur\u00fccksetzen wollen?
+configuration.settings.setting.reset.submit=Auf Standardwert zur\u00fccksetzen

From c6a140c3db764d020bfc109787f4c6d8d0fdcfa2 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 8 Nov 2020 10:38:07 +0100
Subject: [PATCH 37/93] Renamed CategoriesController to
 CategorySystemController

---
 .../ui/admin/categories/CategoriesPage.java   |   5 +-
 ...java => CategorySystemFormController.java} |  28 ++--
 .../categories/CategorySystemsController.java | 134 ++++++++++++++++++
 3 files changed, 157 insertions(+), 10 deletions(-)
 rename ccm-core/src/main/java/org/libreccm/ui/admin/categories/{CategoriesController.java => CategorySystemFormController.java} (68%)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
index fa877b379..d9dba20df 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
@@ -36,14 +36,15 @@ public class CategoriesPage implements AdminPage {
     @Override
     public Set<Class<?>> getControllerClasses() {
         final Set<Class<?>> classes = new HashSet<>();
-        classes.add(CategoriesController.class);
+        classes.add(CategorySystemsController.class);
+        classes.add(CategorySystemFormController.class);
         return classes;
     }
 
     @Override
     public String getUriIdentifier() {
         return String.format(
-            "%s#getCategories", CategoriesController.class.getSimpleName()
+            "%s#getCategories", CategorySystemsController.class.getSimpleName()
         );
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
similarity index 68%
rename from ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
rename to ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
index aebf65cf7..179f25fe2 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
@@ -24,23 +24,35 @@ import org.libreccm.security.RequiresPrivilege;
 
 import javax.enterprise.context.RequestScoped;
 import javax.mvc.Controller;
-import javax.ws.rs.GET;
+import javax.transaction.Transactional;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-@RequestScoped
 @Controller
-@Path("/categories")
-public class CategoriesController {
+@Path("/categorysystems")
+@RequestScoped
+public class CategorySystemFormController {
     
-    @GET
-    @Path("/")
+    @POST
+    @Path("/new")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getCategories() {
-        return "org/libreccm/ui/admin/categories.xhtml";
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String createCategorySystem() {
+        throw new UnsupportedOperationException();
     }
+    
+    @POST
+    @Path("/{categorySystemIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateCategorySystem() {
+        throw new UnsupportedOperationException();
+    }
+    
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
new file mode 100644
index 000000000..c324456b6
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/categorymanager")
+public class CategorySystemsController {
+
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getCategoryManager() {
+        return getCategorySystems();
+    }
+
+    @GET
+    @Path("/categorysystems")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getCategorySystems() {
+        // ToDo
+        return "org/libreccm/ui/admin/categories/categorysystems.xhtml";
+    }
+
+    @GET
+    @Path("/categorysystems/{categorySystemIdentifier}/details")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getCategorySystem(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier
+    ) {
+        // ToDo
+        return "org/libreccm/ui/admin/categories/categorysystem-details.xhtml";
+    }
+
+    @GET
+    @Path("/categorysystems/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String newCategorySystem(
+    ) {
+        // ToDo
+        return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+    }
+
+    @GET
+    @Path("/categorysystems/{categorySystemIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String editCategorySystem(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier
+    ) {
+        // ToDo
+        return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+    }
+
+    @POST
+    @Path("/categorysystems/{categorySystemIdentifier}/delete")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String deleteCategorySystem(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier
+    ) {
+        // ToDo
+        return "redirect:categorymanager/categorysystems";
+    }
+    
+    @POST
+    @Path("/categorysystems/{categorySystemIdentifier}/owners/add")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String addOwner(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier
+    ) {
+        // ToDo
+        return String.format(
+            "redirect:categorymanager/categorysystems/%s",
+            categorySystemIdentifier
+        );
+    }
+    
+    @POST
+    @Path("/categorysystems/{categorySystemIdentifier}/owners/remove")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String removeOwner(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier
+    ) {
+        // ToDo
+        return String.format(
+            "redirect:categorymanager/categorysystems/%s",
+            categorySystemIdentifier
+        );
+    }
+
+}

From 1b7bcfea491d9fdcd56207bbd87f47c7663f86e4 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 8 Nov 2020 11:58:45 +0100
Subject: [PATCH 38/93] Controllers for the Admin UI for categories

---
 .../categories/CategoriesController.java      | 155 +++++
 .../ui/admin/categories/CategoriesPage.java   |   2 +
 .../categories/CategoryFormController.java    |  58 ++
 .../CategorySystemDetailsModel.java           | 151 +++++
 .../CategorySystemFormController.java         |   2 +-
 .../categories/CategorySystemOwnerRow.java    |  83 +++
 .../categories/CategorySystemTableRow.java    | 113 ++++
 .../categories/CategorySystemsController.java | 628 +++++++++++++++++-
 .../categories/CategorySystemsTableModel.java |  86 +++
 9 files changed, 1256 insertions(+), 22 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerRow.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
new file mode 100644
index 000000000..c51537c66
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/categorymanager/categories")
+public class CategoriesController {
+
+    @GET
+    @Path("/{categoryIdentifier}")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getCategory(
+        @PathParam("categoryIdentifier") final String categoryIdentifier
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    @GET
+    @Path("/{categoryIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String editCategory(
+        @PathParam("categoryIdentifier") final String categoryIdentifier
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    @GET
+    @Path("/{categoryIdentifier}/subcategories/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String newSubCategory(
+        @PathParam("categoryIdentifier") final String categoryIdentifier
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{categoryIdentifier}/subcategories/move")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String moveSubCategory(
+        @PathParam("categoryIdentifier") final String categoryIdentifier
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{categoryIdentifier}/subcategories/remove")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String removeSubCategory(
+        @PathParam("categoryIdentifier") final String categoryIdentifier
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{categoryIdentifier}/title/add")
+    @AuthorizationRequired
+    public String addTitle(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{categoryIdentifier}/title/${locale}/edit")
+    @AuthorizationRequired
+    public String editTitle(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier,
+        @PathParam("locale") final String localeParam
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{categoryIdentifier}/title/${locale}/remove")
+    @AuthorizationRequired
+    public String removeTitle(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier,
+        @PathParam("locale") final String localeParam
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{categoryIdentifier}description/add")
+    @AuthorizationRequired
+    public String addDescription(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{categoryIdentifier}/description/${locale}/edit")
+    @AuthorizationRequired
+    public String editDescription(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier,
+        @PathParam("locale") final String localeParam
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{categoryIdentifier}/description/${locale}/remove")
+    @AuthorizationRequired
+    public String removeDescription(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier,
+        @PathParam("locale") final String localeParam
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
index d9dba20df..150bb5d73 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
@@ -38,6 +38,8 @@ public class CategoriesPage implements AdminPage {
         final Set<Class<?>> classes = new HashSet<>();
         classes.add(CategorySystemsController.class);
         classes.add(CategorySystemFormController.class);
+        classes.add(CategoriesController.class);
+        classes.add(CategoryFormController.class);
         return classes;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
new file mode 100644
index 000000000..7bac08a5d
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.transaction.Transactional;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/categorymanager/categories")
+public class CategoryFormController {
+
+    @POST
+    @Path("/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String createCategory() {
+        throw new UnsupportedOperationException();
+    }
+
+    @POST
+    @Path("/{categoryIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateCategory() {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
new file mode 100644
index 000000000..51b03d8a3
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import org.libreccm.categorization.Domain;
+import org.libreccm.categorization.DomainOwnership;
+import org.libreccm.ui.Message;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.transaction.Transactional;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class CategorySystemDetailsModel {
+
+    private long categorySystemId;
+
+    private String uuid;
+
+    private String domainKey;
+
+    private String uri;
+
+    private Map<String, String> title;
+
+    private Map<String, String> description;
+
+    private List<CategorySystemOwnerRow> owners;
+
+    private final List<Message> messages;
+
+    public CategorySystemDetailsModel() {
+        messages = new ArrayList<>();
+    }
+
+    public long getCategorySystemId() {
+        return categorySystemId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public String getDomainKey() {
+        return domainKey;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    public Map<String, String> getTitle() {
+        return Collections.unmodifiableMap(title);
+    }
+
+    public Map<String, String> getDescription() {
+        return Collections.unmodifiableMap(description);
+    }
+
+    public List<CategorySystemOwnerRow> getOwners() {
+        return Collections.unmodifiableList(owners);
+    }
+
+    @Transactional(Transactional.TxType.REQUIRED)
+    protected void setCategorySystem(final Domain domain) {
+        Objects.requireNonNull(domain);
+
+        categorySystemId = domain.getObjectId();
+        uuid = domain.getUuid();
+        domainKey = domain.getDomainKey();
+        uri = domain.getUri();
+        title = domain
+            .getTitle()
+            .getValues()
+            .entrySet()
+            .stream()
+            .collect(
+                Collectors.toMap(
+                    entry -> entry.getKey().toString(),
+                    entry -> entry.getValue()
+                )
+            );
+        description = domain
+            .getDescription()
+            .getValues()
+            .entrySet()
+            .stream()
+            .collect(
+                Collectors.toMap(
+                    entry -> entry.getKey().toString(),
+                    entry -> entry.getValue()
+                )
+            );
+        
+        owners = domain
+            .getOwners()
+            .stream()
+            .map(this::buildOwnerRow)
+            .sorted()
+            .collect(Collectors.toList());
+    }
+    
+     public List<Message> getMessages() {
+        return Collections.unmodifiableList(messages);
+    }
+    
+    public void addMessage(final Message message) {
+        messages.add(message);
+    }
+    
+    
+
+    
+    private CategorySystemOwnerRow buildOwnerRow(
+        final DomainOwnership ownership
+    ) {
+        final CategorySystemOwnerRow ownerRow = new CategorySystemOwnerRow();
+        ownerRow.setOwnershipId(ownership.getOwnershipId());
+        ownerRow.setUuid(ownership.getUuid());
+        ownerRow.setContext(ownership.getContext());
+        ownerRow.setOwnerOrder(ownership.getOwnerOrder());
+        ownerRow.setOwnerAppName(ownership.getOwner().getDisplayName());
+        
+        return ownerRow;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
index 179f25fe2..d45df8c31 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
@@ -33,7 +33,7 @@ import javax.ws.rs.Path;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Controller
-@Path("/categorysystems")
+@Path("/categorymanager/categorysystems")
 @RequestScoped
 public class CategorySystemFormController {
     
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerRow.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerRow.java
new file mode 100644
index 000000000..a7ac37117
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerRow.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class CategorySystemOwnerRow 
+    implements Comparable<CategorySystemOwnerRow>{
+    
+    private long ownershipId;
+    
+    private String uuid;
+    
+    private String ownerAppName;
+    
+    private String context;
+    
+    private long ownerOrder;
+
+    public long getOwnershipId() {
+        return ownershipId;
+    }
+
+    void setOwnershipId(final long ownershipId) {
+        this.ownershipId = ownershipId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    void setUuid(final String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getOwnerAppName() {
+        return ownerAppName;
+    }
+
+    void setOwnerAppName(final String ownerAppName) {
+        this.ownerAppName = ownerAppName;
+    }
+
+    public String getContext() {
+        return context;
+    }
+
+    void setContext(final String context) {
+        this.context = context;
+    }
+
+    public long getOwnerOrder() {
+        return ownerOrder;
+    }
+
+    void setOwnerOrder(final long ownerOrder) {
+        this.ownerOrder = ownerOrder;
+    }
+    
+    @Override
+    public int compareTo(final CategorySystemOwnerRow other) {
+        return Long.compare(ownerOrder, other.getOwnerOrder());
+    }
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java
new file mode 100644
index 000000000..6a6839eb9
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class CategorySystemTableRow implements Comparable<CategorySystemTableRow>{
+
+    private long domainId;
+
+    private String domainKey;
+
+    private String uri;
+
+    private Map<String, String> title;
+
+    private String version;
+
+    private String released;
+
+    public long getDomainId() {
+        return domainId;
+    }
+
+    void setDomainId(final long domainId) {
+        this.domainId = domainId;
+    }
+
+    public String getDomainKey() {
+        return domainKey;
+    }
+
+    void setDomainKey(final String domainKey) {
+        this.domainKey = domainKey;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    void setUri(final String uri) {
+        this.uri = uri;
+    }
+
+    public Map<String, String> getTitle() {
+        return Collections.unmodifiableMap(title);
+    }
+
+    void setTitle(final Map<String, String> title) {
+        this.title = new HashMap<>(title);
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    void setVersion(final String version) {
+        this.version = version;
+    }
+
+    public String getReleased() {
+        return released;
+    }
+
+    void setReleased(final String released) {
+        this.released = released;
+    }
+    
+      @Override
+    public int compareTo(final CategorySystemTableRow other) {
+        int result;
+        result = Objects.compare(
+            domainKey, other.getDomainKey(), String::compareTo
+        );
+        
+        if (result == 0) {
+            result = Objects.compare(uri, uri, String::compareTo);
+        }
+        
+        if (result == 0) {
+            result = Objects.compare(
+                domainId, other.getDomainId(), Long::compare
+            );
+        }
+        
+        return result;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
index c324456b6..d0874747f 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
@@ -18,12 +18,31 @@
  */
 package org.libreccm.ui.admin.categories;
 
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.categorization.Domain;
+import org.libreccm.categorization.DomainManager;
+import org.libreccm.categorization.DomainRepository;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.ui.Message;
+import org.libreccm.ui.MessageType;
+import org.libreccm.ui.admin.AdminMessages;
+import org.libreccm.web.ApplicationRepository;
+import org.libreccm.web.CcmApplication;
+
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -38,6 +57,27 @@ import javax.ws.rs.PathParam;
 @Path("/categorymanager")
 public class CategorySystemsController {
 
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private CategorySystemDetailsModel categorySystemDetailsModel;
+
+    @Inject
+    private ApplicationRepository applicationRepository;
+
+    @Inject
+    private DomainManager domainManager;
+
+    @Inject
+    private DomainRepository domainRepository;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private Models models;
+
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -51,7 +91,6 @@ public class CategorySystemsController {
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String getCategorySystems() {
-        // ToDo
         return "org/libreccm/ui/admin/categories/categorysystems.xhtml";
     }
 
@@ -59,21 +98,56 @@ public class CategorySystemsController {
     @Path("/categorysystems/{categorySystemIdentifier}/details")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getCategorySystem(
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String getCategorySystemDetails(
         @PathParam("categorySystemIdentifier")
         final String categorySystemIdentifier
     ) {
-        // ToDo
-        return "org/libreccm/ui/admin/categories/categorysystem-details.xhtml";
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categorySystemIdentifier
+        );
+        final Optional<Domain> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = domainRepository.findById(
+                    Long.parseLong(identifier.getIdentifier()
+                    )
+                );
+                break;
+            case UUID:
+                result = domainRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = domainRepository.findByDomainKey(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            categorySystemDetailsModel.setCategorySystem(result.get());
+            return "org/libreccm/ui/admin/categories/categorysystem-details.xhtml";
+        } else {
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categorysystems.not_found.message",
+                        Arrays.asList(categorySystemIdentifier)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+        }
     }
 
     @GET
     @Path("/categorysystems/new")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String newCategorySystem(
-    ) {
-        // ToDo
+    public String newCategorySystem() {
         return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
     }
 
@@ -81,54 +155,566 @@ public class CategorySystemsController {
     @Path("/categorysystems/{categorySystemIdentifier}/edit")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String editCategorySystem(
         @PathParam("categorySystemIdentifier")
         final String categorySystemIdentifier
     ) {
-        // ToDo
-        return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categorySystemIdentifier
+        );
+        final Optional<Domain> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = domainRepository.findById(
+                    Long.parseLong(identifier.getIdentifier()
+                    )
+                );
+                break;
+            case UUID:
+                result = domainRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = domainRepository.findByDomainKey(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            categorySystemDetailsModel.setCategorySystem(result.get());
+            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+        } else {
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categorysystems.not_found.message",
+                        Arrays.asList(categorySystemIdentifier)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+        }
     }
 
     @POST
     @Path("/categorysystems/{categorySystemIdentifier}/delete")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String deleteCategorySystem(
         @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier
+        final String categorySystemIdentifier,
+        @FormParam("confirmed") final String confirmed
     ) {
-        // ToDo
+        if (Objects.equals(confirmed, "true")) {
+            final Identifier identifier = identifierParser.parseIdentifier(
+                categorySystemIdentifier
+            );
+            final Optional<Domain> result;
+            switch (identifier.getType()) {
+                case ID:
+                    result = domainRepository.findById(
+                        Long.parseLong(identifier.getIdentifier()
+                        )
+                    );
+                    break;
+                case UUID:
+                    result = domainRepository.findByUuid(
+                        identifier.getIdentifier()
+                    );
+                    break;
+                default:
+                    result = domainRepository.findByDomainKey(
+                        identifier.getIdentifier()
+                    );
+                    break;
+            }
+
+            if (result.isPresent()) {
+                domainRepository.delete(result.get());
+            } else {
+                categorySystemDetailsModel.addMessage(
+                    new Message(
+                        adminMessages.getMessage(
+                            "categorysystems.not_found.message",
+                            Arrays.asList(categorySystemIdentifier)
+                        ),
+                        MessageType.WARNING
+                    )
+                );
+                return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+            }
+        }
         return "redirect:categorymanager/categorysystems";
     }
-    
+
+    @POST
+    @Path("/categorysystems/{categorySystemIdentifier}/title/add")
+    @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String addTitle(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier,
+        @FormParam("locale") final String localeParam,
+        @FormParam("value") final String value
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categorySystemIdentifier
+        );
+        final Optional<Domain> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = domainRepository.findById(
+                    Long.parseLong(identifier.getIdentifier()
+                    )
+                );
+                break;
+            case UUID:
+                result = domainRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = domainRepository.findByDomainKey(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Domain domain = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            domain.getTitle().addValue(locale, value);
+            categorySystemDetailsModel.setCategorySystem(domain);
+            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+        } else {
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categorysystems.not_found.message",
+                        Arrays.asList(categorySystemIdentifier)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+        }
+    }
+
+    @POST
+    @Path("/categorysystems/{categorySystemIdentifier}/title/${locale}/edit")
+    @AuthorizationRequired
+    public String editTitle(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier,
+        @PathParam("locale") final String localeParam,
+        @FormParam("value") final String value
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categorySystemIdentifier
+        );
+        final Optional<Domain> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = domainRepository.findById(
+                    Long.parseLong(identifier.getIdentifier()
+                    )
+                );
+                break;
+            case UUID:
+                result = domainRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = domainRepository.findByDomainKey(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Domain domain = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            domain.getTitle().addValue(locale, value);
+            categorySystemDetailsModel.setCategorySystem(domain);
+            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+        } else {
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categorysystems.not_found.message",
+                        Arrays.asList(categorySystemIdentifier)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+        }
+    }
+
+    @POST
+    @Path("/categorysystems/{categorySystemIdentifier}/title/${locale}/remove")
+    @AuthorizationRequired
+    public String removeTitle(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier,
+        @PathParam("locale") final String localeParam
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categorySystemIdentifier
+        );
+        final Optional<Domain> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = domainRepository.findById(
+                    Long.parseLong(identifier.getIdentifier()
+                    )
+                );
+                break;
+            case UUID:
+                result = domainRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = domainRepository.findByDomainKey(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Domain domain = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            domain.getTitle().removeValue(locale);
+            categorySystemDetailsModel.setCategorySystem(domain);
+            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+        } else {
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categorysystems.not_found.message",
+                        Arrays.asList(categorySystemIdentifier)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+        }
+    }
+
+    @POST
+    @Path("/categorysystems/{categorySystemIdentifier}/description/add")
+    @AuthorizationRequired
+    public String addDescription(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier,
+        @FormParam("locale") final String localeParam,
+        @FormParam("value") final String value
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categorySystemIdentifier
+        );
+        final Optional<Domain> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = domainRepository.findById(
+                    Long.parseLong(identifier.getIdentifier()
+                    )
+                );
+                break;
+            case UUID:
+                result = domainRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = domainRepository.findByDomainKey(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Domain domain = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            domain.getDescription().addValue(locale, value);
+            categorySystemDetailsModel.setCategorySystem(domain);
+            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+        } else {
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categorysystems.not_found.message",
+                        Arrays.asList(categorySystemIdentifier)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+        }
+    }
+
+    @POST
+    @Path(
+        "/categorysystems/{categorySystemIdentifier}/description/${locale}/edit")
+    @AuthorizationRequired
+    public String editDescription(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier,
+        @PathParam("locale") final String localeParam,
+        @FormParam("value") final String value
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categorySystemIdentifier
+        );
+        final Optional<Domain> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = domainRepository.findById(
+                    Long.parseLong(identifier.getIdentifier()
+                    )
+                );
+                break;
+            case UUID:
+                result = domainRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = domainRepository.findByDomainKey(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Domain domain = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            domain.getDescription().addValue(locale, value);
+            categorySystemDetailsModel.setCategorySystem(domain);
+            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+        } else {
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categorysystems.not_found.message",
+                        Arrays.asList(categorySystemIdentifier)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+        }
+    }
+
+    @POST
+    @Path(
+        "/categorysystems/{categorySystemIdentifier}/description/${locale}/remove")
+    @AuthorizationRequired
+    public String removeDescription(
+        @PathParam("categorySystemIdentifier")
+        final String categorySystemIdentifier,
+        @PathParam("locale") final String localeParam
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categorySystemIdentifier
+        );
+        final Optional<Domain> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = domainRepository.findById(
+                    Long.parseLong(identifier.getIdentifier()
+                    )
+                );
+                break;
+            case UUID:
+                result = domainRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                result = domainRepository.findByDomainKey(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Domain domain = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            domain.getDescription().removeValue(locale);
+            categorySystemDetailsModel.setCategorySystem(domain);
+            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+        } else {
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categorysystems.not_found.message",
+                        Arrays.asList(categorySystemIdentifier)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+        }
+    }
+
     @POST
     @Path("/categorysystems/{categorySystemIdentifier}/owners/add")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String addOwner(
         @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier
+        final String categorySystemIdentifier,
+        @FormParam("applicationUuid") final String applicationUuid
     ) {
-        // ToDo
-        return String.format(
-            "redirect:categorymanager/categorysystems/%s",
+        final Identifier identifier = identifierParser.parseIdentifier(
             categorySystemIdentifier
         );
+        final Optional<Domain> domainResult;
+        switch (identifier.getType()) {
+            case ID:
+                domainResult = domainRepository.findById(
+                    Long.parseLong(identifier.getIdentifier()
+                    )
+                );
+                break;
+            case UUID:
+                domainResult = domainRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                domainResult = domainRepository.findByDomainKey(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (domainResult.isPresent()) {
+            final Domain domain = domainResult.get();
+
+            final Optional<CcmApplication> appResult = applicationRepository
+                .findByUuid(applicationUuid);
+            if (!appResult.isPresent()) {
+                categorySystemDetailsModel.addMessage(
+                    new Message(
+                        adminMessages.getMessage(
+                            "categorysystems.add_owner.not_found.message",
+                            Arrays.asList(applicationRepository)
+                        ),
+                        MessageType.WARNING
+                    )
+                );
+                return "org/libreccm/ui/admin/categories/application-not-found.xhtml";
+            }
+
+            final CcmApplication owner = appResult.get();
+
+            domainManager.addDomainOwner(owner, domain);
+
+            return String.format(
+                "redirect:categorymanager/categorysystems/%s",
+                categorySystemIdentifier
+            );
+        } else {
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categorysystems.not_found.message",
+                        Arrays.asList(categorySystemIdentifier)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+        }
+
+        // ToDo
     }
-    
+
     @POST
     @Path("/categorysystems/{categorySystemIdentifier}/owners/remove")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String removeOwner(
         @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier
+        final String categorySystemIdentifier,
+        @FormParam("applicationUuid") final String applicationUuid
     ) {
-        // ToDo
-        return String.format(
-            "redirect:categorymanager/categorysystems/%s",
+        final Identifier identifier = identifierParser.parseIdentifier(
             categorySystemIdentifier
         );
+        final Optional<Domain> domainResult;
+        switch (identifier.getType()) {
+            case ID:
+                domainResult = domainRepository.findById(
+                    Long.parseLong(identifier.getIdentifier()
+                    )
+                );
+                break;
+            case UUID:
+                domainResult = domainRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+            default:
+                domainResult = domainRepository.findByDomainKey(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (domainResult.isPresent()) {
+            final Domain domain = domainResult.get();
+
+            final Optional<CcmApplication> appResult = applicationRepository
+                .findByUuid(applicationUuid);
+            if (!appResult.isPresent()) {
+                categorySystemDetailsModel.addMessage(
+                    new Message(
+                        adminMessages.getMessage(
+                            "categorysystems.add_owner.not_found.message",
+                            Arrays.asList(applicationRepository)
+                        ),
+                        MessageType.WARNING
+                    )
+                );
+                return "org/libreccm/ui/admin/categories/application-not-found.xhtml";
+            }
+
+            final CcmApplication owner = appResult.get();
+
+            domainManager.removeDomainOwner(owner, domain);
+
+            return String.format(
+                "redirect:categorymanager/categorysystems/%s",
+                categorySystemIdentifier
+            );
+        } else {
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categorysystems.not_found.message",
+                        Arrays.asList(categorySystemIdentifier)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+        }
     }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
new file mode 100644
index 000000000..c46be2369
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import org.libreccm.categorization.Domain;
+import org.libreccm.categorization.DomainRepository;
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.transaction.Transactional;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("CategorySystemsTableModel")
+public class CategorySystemsTableModel {
+
+    @Inject
+    private DomainRepository domainRepository;
+
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional
+    public List<CategorySystemTableRow> getCategorySystems() {
+        return domainRepository
+            .findAll()
+            .stream()
+            .map(this::buildTableRow)
+            .sorted()
+            .collect(Collectors.toList());
+    }
+
+    private CategorySystemTableRow buildTableRow(final Domain domain) {
+        final CategorySystemTableRow row = new CategorySystemTableRow();
+        
+        row.setDomainId(domain.getObjectId());
+        row.setDomainKey(domain.getDomainKey());
+        row.setUri(domain.getUri());
+        row.setVersion(domain.getVersion());
+        row.setReleased(
+            DateTimeFormatter.ISO_DATE_TIME.format(
+                domain.getReleased().toInstant()
+            )
+        );
+        row.setTitle(
+            domain
+                .getTitle()
+            .getValues()
+            .entrySet()
+            .stream()
+            .collect(
+                Collectors.toMap(
+                    entry -> entry.getKey().toString(), 
+                    entry -> entry.getValue()
+                )
+            )
+        );
+        return row;
+    }
+}

From cbeb1063eee82e99eba6bb09ba0d0e8265c5c9e7 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 10 Nov 2020 19:37:56 +0100
Subject: [PATCH 39/93] Category Management Admin UI

---
 .../categories/CategoriesController.java      | 498 +++++++++++++++++-
 .../ui/admin/categories/CategoriesPage.java   |   2 +-
 .../categories/CategoryDetailsModel.java      | 172 ++++++
 .../categories/CategoryFormController.java    | 149 +++++-
 .../admin/categories/CategoryNodeModel.java   |  88 ++++
 .../CategorySystemDetailsModel.java           |  27 +-
 .../CategorySystemFormController.java         |  92 +++-
 .../categories/CategorySystemTableRow.java    |  18 +-
 .../categories/CategorySystemsController.java |   8 +-
 .../application-not-found.xhtml}              |   2 +-
 .../admin/categories/category-details.xhtml   |  25 +
 .../ui/admin/categories/category-form.xhtml   |  25 +
 .../admin/categories/category-not-found.xhtml |  25 +
 .../categories/categorysystem-details.xhtml   |  25 +
 .../categories/categorysystem-form.xhtml      |  25 +
 .../categories/categorysystem-not-found.xhtml |  25 +
 .../ui/admin/categories/categorysystems.xhtml |  70 +++
 .../org/libreccm/ui/AdminBundle.properties    |  10 +-
 .../org/libreccm/ui/AdminBundle_de.properties |  10 +-
 19 files changed, 1235 insertions(+), 61 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
 rename ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/{categories.xhtml => categories/application-not-found.xhtml} (95%)
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-not-found.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
index c51537c66..f79eda73a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
@@ -18,12 +18,28 @@
  */
 package org.libreccm.ui.admin.categories;
 
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.categorization.Category;
+import org.libreccm.categorization.CategoryManager;
+import org.libreccm.categorization.CategoryRepository;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.ui.Message;
+import org.libreccm.ui.MessageType;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -38,118 +54,548 @@ import javax.ws.rs.PathParam;
 @Path("/categorymanager/categories")
 public class CategoriesController {
 
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private CategoryDetailsModel categoryDetailsModel;
+
+    @Inject
+    private CategoryManager categoryManager;
+
+    @Inject
+    private CategoryRepository categoryRepository;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private Models models;
+
     @GET
     @Path("/{categoryIdentifier}")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String getCategory(
         @PathParam("categoryIdentifier") final String categoryIdentifier
     ) {
-        throw new UnsupportedOperationException();
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categoryIdentifier
+        );
+        final Optional<Category> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = categoryRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            default:
+                result = categoryRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            categoryDetailsModel.setCategory(result.get());
+            return "org/libreccm/ui/admin/categories/category-details.xhtml";
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifier)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
     @GET
     @Path("/{categoryIdentifier}/edit")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String editCategory(
         @PathParam("categoryIdentifier") final String categoryIdentifier
     ) {
-        throw new UnsupportedOperationException();
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categoryIdentifier
+        );
+        final Optional<Category> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = categoryRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            default:
+                result = categoryRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            categoryDetailsModel.setCategory(result.get());
+            return "org/libreccm/ui/admin/categories/category-form.xhtml";
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifier)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
     @GET
     @Path("/{categoryIdentifier}/subcategories/new")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String newSubCategory(
         @PathParam("categoryIdentifier") final String categoryIdentifier
     ) {
-        throw new UnsupportedOperationException();
+        return "org/libreccm/ui/admin/categories/category-form.xhtml";
     }
 
     @POST
     @Path("/{categoryIdentifier}/subcategories/move")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String moveSubCategory(
-        @PathParam("categoryIdentifier") final String categoryIdentifier
+        @PathParam("categoryIdentifier") final String categoryIdentifierParam,
+        @FormParam("targetIdentifier") final String targetIdentifierParam
     ) {
-        throw new UnsupportedOperationException();
+        final Identifier categoryIdentifier = identifierParser.parseIdentifier(
+            categoryIdentifierParam
+        );
+        final Optional<Category> categoryResult;
+        switch (categoryIdentifier.getType()) {
+            case ID:
+                categoryResult = categoryRepository.findById(
+                    Long.parseLong(categoryIdentifier.getIdentifier())
+                );
+                break;
+            default:
+                categoryResult = categoryRepository.findByUuid(
+                    categoryIdentifier.getIdentifier()
+                );
+                break;
+        }
+        if (!categoryResult.isPresent()) {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifierParam)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
+
+        final Identifier targetIdentifier = identifierParser.parseIdentifier(
+            targetIdentifierParam
+        );
+
+        final Optional<Category> targetResult;
+        switch (targetIdentifier.getType()) {
+            case ID:
+                targetResult = categoryRepository.findById(
+                    Long.parseLong(targetIdentifier.getIdentifier())
+                );
+                break;
+            default:
+                targetResult = categoryRepository.findByUuid(
+                    targetIdentifier.getIdentifier()
+                );
+                break;
+        }
+        if (!categoryResult.isPresent()) {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(targetIdentifierParam)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
+
+        final Category category = categoryResult.get();
+        final Category oldParent = category.getParentCategory();
+        if (oldParent == null) {
+            return String.format(
+                "redirect:categorymanager/categories/ID-%d",
+                category.getObjectId()
+            );
+        }
+        final Category target = targetResult.get();
+
+        categoryManager.removeSubCategoryFromCategory(category, oldParent);
+        categoryManager.addSubCategoryToCategory(category, target);
+
+        return String.format(
+            "redirect:categorymanager/categories/ID-%d", target.getObjectId()
+        );
     }
 
     @POST
     @Path("/{categoryIdentifier}/subcategories/remove")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String removeSubCategory(
         @PathParam("categoryIdentifier") final String categoryIdentifier
     ) {
-        throw new UnsupportedOperationException();
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categoryIdentifier
+        );
+        final Optional<Category> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = categoryRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            default:
+                result = categoryRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Category category = result.get();
+            final Category parentCategory = category.getParentCategory();
+            if (parentCategory == null) {
+                return String.format(
+                    "redirect:categorymanager/categories/ID-%d",
+                    category.getObjectId()
+                );
+            }
+            categoryManager.removeSubCategoryFromCategory(category,
+                                                          parentCategory
+            );
+            categoryRepository.delete(category);
+            return String.format(
+                "redirect:categorymanager/categories/ID-%d",
+                parentCategory.getObjectId()
+            );
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifier)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
     @POST
     @Path("/{categoryIdentifier}/title/add")
     @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public String addTitle(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier
+        @PathParam("categoryIdentifier")
+        final String categoryIdentifierParam,
+        @FormParam("locale") final String localeParam,
+        @FormParam("value") final String value
     ) {
-        throw new UnsupportedOperationException();
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categoryIdentifierParam
+        );
+        final Optional<Category> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = categoryRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            default:
+                result = categoryRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Category category = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            category.getTitle().addValue(locale, value);
+            categoryRepository.save(category);
+            return String.format(
+                "redirect:categorymanager/categories/ID-%d",
+                category.getObjectId()
+            );
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifierParam)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
     @POST
     @Path("/{categoryIdentifier}/title/${locale}/edit")
     @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public String editTitle(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier,
-        @PathParam("locale") final String localeParam
+        @PathParam("categoryIdentifier")
+        final String categoryIdentifierParam,
+        @PathParam("locale") final String localeParam,
+        @FormParam("value") final String value
     ) {
-        throw new UnsupportedOperationException();
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categoryIdentifierParam
+        );
+        final Optional<Category> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = categoryRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            default:
+                result = categoryRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Category category = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            category.getTitle().addValue(locale, value);
+            categoryRepository.save(category);
+            return String.format(
+                "redirect:categorymanager/categories/ID-%d",
+                category.getObjectId()
+            );
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifierParam)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
     @POST
     @Path("/{categoryIdentifier}/title/${locale}/remove")
     @AuthorizationRequired
     public String removeTitle(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier,
+        @PathParam("categoryIdentifier")
+        final String categoryIdentifierParam,
         @PathParam("locale") final String localeParam
     ) {
-        throw new UnsupportedOperationException();
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categoryIdentifierParam
+        );
+        final Optional<Category> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = categoryRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            default:
+                result = categoryRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Category category = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            category.getTitle().removeValue(locale);
+            categoryRepository.save(category);
+            return String.format(
+                "redirect:categorymanager/categories/ID-%d",
+                category.getObjectId()
+            );
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifierParam)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
     @POST
     @Path("/{categoryIdentifier}description/add")
     @AuthorizationRequired
     public String addDescription(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier
+        @PathParam("categoryIdentifier")
+        final String categoryIdentifierParam,
+        @FormParam("locale") final String localeParam,
+        @FormParam("value") final String value
     ) {
-        throw new UnsupportedOperationException();
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categoryIdentifierParam
+        );
+        final Optional<Category> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = categoryRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            default:
+                result = categoryRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Category category = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            category.getDescription().addValue(locale, value);
+            categoryRepository.save(category);
+            return String.format(
+                "redirect:categorymanager/categories/ID-%d",
+                category.getObjectId()
+            );
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifierParam)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
     @POST
     @Path("/{categoryIdentifier}/description/${locale}/edit")
     @AuthorizationRequired
     public String editDescription(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier,
-        @PathParam("locale") final String localeParam
+        @PathParam("categoryIdentifier")
+        final String categoryIdentifierParam,
+        @PathParam("locale") final String localeParam,
+        @FormParam("value") final String value
     ) {
-        throw new UnsupportedOperationException();
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categoryIdentifierParam
+        );
+        final Optional<Category> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = categoryRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            default:
+                result = categoryRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Category category = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            category.getDescription().addValue(locale, value);
+            categoryRepository.save(category);
+            return String.format(
+                "redirect:categorymanager/categories/ID-%d",
+                category.getObjectId()
+            );
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifierParam)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
     @POST
     @Path("/{categoryIdentifier}/description/${locale}/remove")
     @AuthorizationRequired
     public String removeDescription(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier,
+        @PathParam("categoryIdentifier")
+        final String categoryIdentifierParam,
         @PathParam("locale") final String localeParam
     ) {
-        throw new UnsupportedOperationException();
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categoryIdentifierParam
+        );
+        final Optional<Category> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = categoryRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            default:
+                result = categoryRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Category category = result.get();
+
+            final Locale locale = new Locale(localeParam);
+            category.getDescription().removeValue(locale);
+            categoryRepository.save(category);
+            return String.format(
+                "redirect:categorymanager/categories/ID-%d",
+                category.getObjectId()
+            );
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifierParam)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
index 150bb5d73..2297d7d11 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
@@ -46,7 +46,7 @@ public class CategoriesPage implements AdminPage {
     @Override
     public String getUriIdentifier() {
         return String.format(
-            "%s#getCategories", CategorySystemsController.class.getSimpleName()
+            "%s#getCategorySystems", CategorySystemsController.class.getSimpleName()
         );
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
new file mode 100644
index 000000000..429684e0f
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import org.libreccm.categorization.Category;
+import org.libreccm.ui.Message;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+import javax.transaction.Transactional;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("CategoryDetailsModel")
+public class CategoryDetailsModel {
+
+    private long categoryId;
+
+    private String uuid;
+
+    private String uniqueId;
+
+    private String name;
+
+    private Map<String, String> title;
+
+    private Map<String, String> description;
+
+    private boolean enabled;
+
+    private boolean visible;
+
+    private boolean abstractCategory;
+
+    private List<CategoryNodeModel> subCategories;
+
+    private CategoryNodeModel parentCategory;
+
+    private long categoryOrder;
+
+    private final List<Message> messages;
+
+    public CategoryDetailsModel() {
+        this.messages = new ArrayList<>();
+    }
+
+    public long getCategoryId() {
+        return categoryId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Map<String, String> getTitle() {
+        return Collections.unmodifiableMap(title);
+    }
+
+    public Map<String, String> getDescription() {
+        return Collections.unmodifiableMap(description);
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+
+    public boolean isAbstractCategory() {
+        return abstractCategory;
+    }
+
+    public List<CategoryNodeModel> getSubCategories() {
+        return Collections.unmodifiableList(subCategories);
+    }
+
+    public CategoryNodeModel getParentCategory() {
+        return parentCategory;
+    }
+
+    public long getCategoryOrder() {
+        return categoryOrder;
+    }
+
+    public List<Message> getMessages() {
+        return Collections.unmodifiableList(messages);
+    }
+
+    public void addMessage(final Message message) {
+        messages.add(message);
+    }
+
+    @Transactional(Transactional.TxType.REQUIRED)
+    protected void setCategory(final Category category) {
+        Objects.requireNonNull(category);
+
+        categoryId = category.getObjectId();
+        uuid = category.getUuid();
+        uniqueId = category.getUniqueId();
+        name = category.getName();
+        title = category
+            .getTitle()
+            .getValues()
+            .entrySet()
+            .stream()
+            .collect(
+                Collectors.toMap(
+                    entry -> entry.getKey().toString(),
+                    entry -> entry.getValue()
+                )
+            );
+        description = category
+            .getDescription()
+            .getValues()
+            .entrySet()
+            .stream()
+            .collect(
+                Collectors.toMap(
+                    entry -> entry.getKey().toString(),
+                    entry -> entry.getValue()
+                )
+            );
+        enabled = category.isEnabled();
+        visible = category.isVisible();
+        abstractCategory = category.isAbstractCategory();
+        subCategories = category
+            .getSubCategories()
+            .stream()
+            .map(CategoryNodeModel::new)
+            .sorted()
+            .collect(Collectors.toList());
+        parentCategory = new CategoryNodeModel(category.getParentCategory());
+        categoryOrder = category.getCategoryOrder();
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
index 7bac08a5d..e08d94e18 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
@@ -18,15 +18,29 @@
  */
 package org.libreccm.ui.admin.categories;
 
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.categorization.Category;
+import org.libreccm.categorization.CategoryManager;
+import org.libreccm.categorization.CategoryRepository;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.ui.Message;
+import org.libreccm.ui.MessageType;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 
 /**
  *
@@ -37,13 +51,95 @@ import javax.ws.rs.Path;
 @Path("/categorymanager/categories")
 public class CategoryFormController {
 
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private CategoryDetailsModel categoryDetailsModel;
+
+    @Inject
+    private CategoryManager categoryManager;
+
+    @Inject
+    private CategoryRepository categoryRepository;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @FormParam("uniqueId")
+    private String uniqueId;
+
+    @FormParam("name")
+    private String name;
+
+    @FormParam("enabled")
+    private boolean enabled;
+
+    @FormParam("visible")
+    private boolean visisble;
+
+    @FormParam("abstractCategory")
+    private boolean abstractCategory;
+
+    @FormParam("categoryOrder")
+    private long categoryOrder;
+
+    @FormParam("parentCategoryIdentifier")
+    private String parentCategoryIdentifier;
+
     @POST
     @Path("/new")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
     public String createCategory() {
-        throw new UnsupportedOperationException();
+        final Identifier parentIdentifier = identifierParser.parseIdentifier(
+            parentCategoryIdentifier
+        );
+        final Optional<Category> parentResult;
+        switch (parentIdentifier.getType()) {
+            case ID:
+                parentResult = categoryRepository.findById(
+                    Long.parseLong(
+                        parentIdentifier.getIdentifier()
+                    )
+                );
+                break;
+            default:
+                parentResult = categoryRepository.findByUuid(
+                    parentIdentifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (parentResult.isPresent()) {
+            final Category parentCategory = parentResult.get();
+            final Category category = new Category();
+            category.setUniqueId(uniqueId);
+            category.setName(name);
+            category.setEnabled(enabled);
+            category.setVisible(visisble);
+            category.setAbstractCategory(abstractCategory);
+            category.setCategoryOrder(categoryOrder);
+
+            categoryRepository.save(category);
+            categoryManager.addSubCategoryToCategory(category, parentCategory);
+
+            return String.format(
+                "redirect:categorymanager/categories/ID-%s",
+                parentCategory.getObjectId()
+            );
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(parentCategoryIdentifier)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
     @POST
@@ -51,8 +147,55 @@ public class CategoryFormController {
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
-    public String updateCategory() {
-        throw new UnsupportedOperationException();
+    public String updateCategory(
+        @PathParam("categoryIdentifierParam")
+        final String categoryIdentifierParam
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            parentCategoryIdentifier
+        );
+        final Optional<Category> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = categoryRepository.findById(
+                    Long.parseLong(
+                        identifier.getIdentifier()
+                    )
+                );
+                break;
+            default:
+                result = categoryRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Category category = result.get();
+            category.setUniqueId(uniqueId);
+            category.setName(name);
+            category.setEnabled(enabled);
+            category.setVisible(visisble);
+            category.setAbstractCategory(abstractCategory);
+            category.setCategoryOrder(categoryOrder);
+            
+            categoryRepository.save(category);
+            
+            return String.format(
+                "redirect:categorymanager/categories/ID-%s",
+                category.getObjectId()
+            );
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifierParam)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
new file mode 100644
index 000000000..d5776222e
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import org.libreccm.categorization.Category;
+
+import java.util.Objects;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class CategoryNodeModel implements Comparable<CategoryNodeModel> {
+
+    private final long categoryId;
+
+    private final String uuid;
+
+    private final String uniqueId;
+
+    private final String name;
+
+    private final long categoryOrder;
+
+    public CategoryNodeModel(final Category category) {
+        Objects.requireNonNull(category);
+        categoryId = category.getObjectId();
+        uuid = category.getUuid();
+        uniqueId = category.getUniqueId();
+        categoryOrder = category.getCategoryOrder();
+        name = category.getName();
+    }
+
+    public long getCategoryId() {
+        return categoryId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public long getCategoryOrder() {
+        return categoryOrder;
+    }
+
+    @Override
+    public int compareTo(final CategoryNodeModel other) {
+        int result = Long.compare(
+            categoryOrder,
+            Objects.requireNonNull(other).getCategoryOrder()
+        );
+        
+        if (result == 0) {
+            result = Objects.compare(
+                name, 
+                Objects.requireNonNull(other).getName(), 
+                String::compareTo
+            );
+        }
+        
+        return result;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index 51b03d8a3..1e7f90bc0 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -29,12 +29,16 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
 import javax.transaction.Transactional;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@RequestScoped
+@Named("CategoryDetailsModel")
 public class CategorySystemDetailsModel {
 
     private long categorySystemId;
@@ -85,6 +89,14 @@ public class CategorySystemDetailsModel {
         return Collections.unmodifiableList(owners);
     }
 
+    public List<Message> getMessages() {
+        return Collections.unmodifiableList(messages);
+    }
+
+    public void addMessage(final Message message) {
+        messages.add(message);
+    }
+
     @Transactional(Transactional.TxType.REQUIRED)
     protected void setCategorySystem(final Domain domain) {
         Objects.requireNonNull(domain);
@@ -115,7 +127,7 @@ public class CategorySystemDetailsModel {
                     entry -> entry.getValue()
                 )
             );
-        
+
         owners = domain
             .getOwners()
             .stream()
@@ -123,18 +135,7 @@ public class CategorySystemDetailsModel {
             .sorted()
             .collect(Collectors.toList());
     }
-    
-     public List<Message> getMessages() {
-        return Collections.unmodifiableList(messages);
-    }
-    
-    public void addMessage(final Message message) {
-        messages.add(message);
-    }
-    
-    
 
-    
     private CategorySystemOwnerRow buildOwnerRow(
         final DomainOwnership ownership
     ) {
@@ -144,7 +145,7 @@ public class CategorySystemDetailsModel {
         ownerRow.setContext(ownership.getContext());
         ownerRow.setOwnerOrder(ownership.getOwnerOrder());
         ownerRow.setOwnerAppName(ownership.getOwner().getDisplayName());
-        
+
         return ownerRow;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
index d45df8c31..bb3acf256 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
@@ -18,15 +18,29 @@
  */
 package org.libreccm.ui.admin.categories;
 
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.categorization.Domain;
+import org.libreccm.categorization.DomainManager;
+import org.libreccm.categorization.DomainRepository;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.ui.Message;
+import org.libreccm.ui.MessageType;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 
 /**
  *
@@ -36,23 +50,89 @@ import javax.ws.rs.Path;
 @Path("/categorymanager/categorysystems")
 @RequestScoped
 public class CategorySystemFormController {
-    
+
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private CategorySystemDetailsModel categorySystemDetailsModel;
+
+    @Inject
+    private DomainRepository domainRepository;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @FormParam("domainKey")
+    private String domainKey;
+
+    @FormParam("uri")
+    private String uri;
+
     @POST
     @Path("/new")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
     public String createCategorySystem() {
-        throw new UnsupportedOperationException();
+        final Domain domain = new Domain();
+        domain.setDomainKey(domainKey);
+        domain.setUri(uri);
+
+        domainRepository.save(domain);
+
+        return "redirect:/categorymanager/categorysystems";
     }
-    
+
     @POST
     @Path("/{categorySystemIdentifier}/edit")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
-    public String updateCategorySystem() {
-        throw new UnsupportedOperationException();
+    public String updateCategorySystem(
+        @PathParam("categorySystemIdentifier")
+        final String identifierParam
+    ) {
+        final Identifier identifier = identifierParser.parseIdentifier(
+            identifierParam
+        );
+        final Optional<Domain> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = domainRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            case UUID:
+                result = domainRepository.findByUuid(identifier.getIdentifier());
+                break;
+            default:
+                result = domainRepository.findByDomainKey(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Domain domain = result.get();
+            domain.setDomainKey(domainKey);
+            domain.setUri(uri);
+            domainRepository.save(domain);
+
+            categorySystemDetailsModel.setCategorySystem(domain);
+            return "org/libreccm/ui/admin/categories/categorysystem-details.xhtml";
+        } else {
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categorysystems.not_found.message",
+                        Arrays.asList(identifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
+        }
     }
-    
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java
index 6a6839eb9..1ae934808 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java
@@ -19,7 +19,6 @@
 package org.libreccm.ui.admin.categories;
 
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -28,7 +27,8 @@ import java.util.Objects;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class CategorySystemTableRow implements Comparable<CategorySystemTableRow>{
+public class CategorySystemTableRow implements
+    Comparable<CategorySystemTableRow> {
 
     private long domainId;
 
@@ -50,6 +50,10 @@ public class CategorySystemTableRow implements Comparable<CategorySystemTableRow
         this.domainId = domainId;
     }
 
+    public String getIdentifier() {
+        return String.format("ID-%d", domainId);
+    }
+
     public String getDomainKey() {
         return domainKey;
     }
@@ -89,24 +93,24 @@ public class CategorySystemTableRow implements Comparable<CategorySystemTableRow
     void setReleased(final String released) {
         this.released = released;
     }
-    
-      @Override
+
+    @Override
     public int compareTo(final CategorySystemTableRow other) {
         int result;
         result = Objects.compare(
             domainKey, other.getDomainKey(), String::compareTo
         );
-        
+
         if (result == 0) {
             result = Objects.compare(uri, uri, String::compareTo);
         }
-        
+
         if (result == 0) {
             result = Objects.compare(
                 domainId, other.getDomainId(), Long::compare
             );
         }
-        
+
         return result;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
index d0874747f..c061843e8 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
@@ -290,6 +290,7 @@ public class CategorySystemsController {
 
             final Locale locale = new Locale(localeParam);
             domain.getTitle().addValue(locale, value);
+            domainRepository.save(domain);
             categorySystemDetailsModel.setCategorySystem(domain);
             return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
         } else {
@@ -343,6 +344,7 @@ public class CategorySystemsController {
 
             final Locale locale = new Locale(localeParam);
             domain.getTitle().addValue(locale, value);
+            domainRepository.save(domain);
             categorySystemDetailsModel.setCategorySystem(domain);
             return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
         } else {
@@ -395,6 +397,7 @@ public class CategorySystemsController {
 
             final Locale locale = new Locale(localeParam);
             domain.getTitle().removeValue(locale);
+            domainRepository.save(domain);
             categorySystemDetailsModel.setCategorySystem(domain);
             return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
         } else {
@@ -448,6 +451,7 @@ public class CategorySystemsController {
 
             final Locale locale = new Locale(localeParam);
             domain.getDescription().addValue(locale, value);
+            domainRepository.save(domain);
             categorySystemDetailsModel.setCategorySystem(domain);
             return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
         } else {
@@ -502,6 +506,7 @@ public class CategorySystemsController {
 
             final Locale locale = new Locale(localeParam);
             domain.getDescription().addValue(locale, value);
+            domainRepository.save(domain);
             categorySystemDetailsModel.setCategorySystem(domain);
             return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
         } else {
@@ -555,6 +560,7 @@ public class CategorySystemsController {
 
             final Locale locale = new Locale(localeParam);
             domain.getDescription().removeValue(locale);
+            domainRepository.save(domain);
             categorySystemDetailsModel.setCategorySystem(domain);
             return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
         } else {
@@ -641,8 +647,6 @@ public class CategorySystemsController {
             );
             return "org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml";
         }
-
-        // ToDo
     }
 
     @POST
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/application-not-found.xhtml
similarity index 95%
rename from ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories.xhtml
rename to ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/application-not-found.xhtml
index 5c639f229..f828f658d 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/application-not-found.xhtml
@@ -17,7 +17,7 @@
         <ui:define name="main">
             <div class="container">
                 <h1>#{AdminMessages['categories.label']}</h1>
-                <p>Placeholder</p>
+                <p>ToDo</p>
             </div>
         </ui:define>
     
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
new file mode 100644
index 000000000..f828f658d
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        
+        <ui:param name="activePage" value="categories" />
+        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+    
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['categories.label']}
+            </li>
+        </ui:define>
+        
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['categories.label']}</h1>
+                <p>ToDo</p>
+            </div>
+        </ui:define>
+    
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
new file mode 100644
index 000000000..f828f658d
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        
+        <ui:param name="activePage" value="categories" />
+        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+    
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['categories.label']}
+            </li>
+        </ui:define>
+        
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['categories.label']}</h1>
+                <p>ToDo</p>
+            </div>
+        </ui:define>
+    
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-not-found.xhtml
new file mode 100644
index 000000000..f828f658d
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-not-found.xhtml
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        
+        <ui:param name="activePage" value="categories" />
+        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+    
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['categories.label']}
+            </li>
+        </ui:define>
+        
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['categories.label']}</h1>
+                <p>ToDo</p>
+            </div>
+        </ui:define>
+    
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
new file mode 100644
index 000000000..f828f658d
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        
+        <ui:param name="activePage" value="categories" />
+        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+    
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['categories.label']}
+            </li>
+        </ui:define>
+        
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['categories.label']}</h1>
+                <p>ToDo</p>
+            </div>
+        </ui:define>
+    
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
new file mode 100644
index 000000000..f828f658d
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        
+        <ui:param name="activePage" value="categories" />
+        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+    
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['categories.label']}
+            </li>
+        </ui:define>
+        
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['categories.label']}</h1>
+                <p>ToDo</p>
+            </div>
+        </ui:define>
+    
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml
new file mode 100644
index 000000000..f828f658d
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+        
+        <ui:param name="activePage" value="categories" />
+        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+    
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['categories.label']}
+            </li>
+        </ui:define>
+        
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['categories.label']}</h1>
+                <p>ToDo</p>
+            </div>
+        </ui:define>
+    
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
new file mode 100644
index 000000000..0cc6aae0b
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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">
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="categories" />
+        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['categories.label']}
+            </li>
+            <li class="breadcrumb-item active">
+                #{AdminMessages['categories.label']}
+            </li>
+            <li class="breadcrumb-item active">
+                #{AdminMessages['categorysystems.label']}
+            </li>
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['categorysystems.label']}</h1>
+
+                <div class="text-right">
+                    <a class="btn btn-secondary"
+                       href="#{mvc.uri('CategorySystemsController#newCategorySystem')}">
+                        <svg class="bi"
+                             width="1em"
+                             height="1em"
+                             fill="currentColor">
+                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#circle-plus" />
+                        </svg>
+                        <span>#{AdminMessages['categorysystems.add']}</span>
+                    </a>
+                </div>
+                <table class="table table-hover categorysystems-table">
+                    <thead class="thead-light">
+                        <tr>
+                            <th>#{AdminMessages['categorysystems.table.headers.domainKey']}</th>
+                            <th>#{AdminMessages['categorysystems.table.headers.uri']}</th>
+                            <th>#{AdminMessages['categorysystems.table.headers.version']}</th>
+                            <th>#{AdminMessages['categorysystems.table.headers.released']}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <c:forEach items="#{CategorySystemsTableModel.categorySystems}" 
+                                   var="categorySystem">
+                            <tr>
+                                <td>
+                                    <a href="#{mvc.uri('CategorySystemsController#getCategorySystemDetails', categorySystem.identifier)}">
+                                    #{categorySystem.domainKey}
+                                    </a>
+                                </td>
+                                <td>#{categorySystem.uri}</td>
+                                <td>#{categorySystem.version}</td>
+                                <td>#{categorySystem.released}</td>
+                            </tr>
+                        </c:forEach>
+                    </tbody>
+                </table>
+
+            </div>
+        </ui:define>
+
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 9e60c46e0..cb8c4676a 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -3,7 +3,7 @@ systeminformation.label=System Information
 applications.label=Applications
 applications.description=Manage application instances
 imexport.label=Import/Export
-categories.label=Categories
+categories.label=Categories Manager
 categories.description=Manage categories
 configuration.label=Configuration
 configuration.description=Manage configuration settings
@@ -240,3 +240,11 @@ configuration.settings.setting.reset.title=Reset setting {0}
 configuration.settings.setting.reset.close=Cancel
 configuration.settings.setting.reset.confirm=Are you sure to set reset setting {1} of configuration {0} to its default value {2}?
 configuration.settings.setting.reset.submit=Reset to default value
+categories.not_found.message=No category identified by {0} available
+categorysystems.not_found.message=No category system identified by {0} available
+categorysystems.label=Category Systems
+categorysystems.add=Add Category System
+categorysystems.table.headers.domainKey=Domain Key
+categorysystems.table.headers.uri=URI
+categorysystems.table.headers.version=Version
+categorysystems.table.headers.released=Released
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 7a051b9ef..1385f1a99 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -3,7 +3,7 @@ systeminformation.label=System Informationen
 applications.label=Anwendungen
 applications.description=Verwalten der Anwendungsinstanzen
 imexport.label=Import/Export
-categories.label=Kategorien
+categories.label=Kategorienmanager
 categories.description=Verwaltung der Kategorien
 configuration.label=Konfiguration
 configuration.description=Bearbeiten der Konfiguration
@@ -240,3 +240,11 @@ configuration.settings.setting.reset.title=Einstellung {0} zur\u00fccksetzen
 configuration.settings.setting.reset.close=Abbrechen
 configuration.settings.setting.reset.confirm=Sind Sie sicher, dass die die Einstellung {1} in Konfiguration {0} auf ihren Standardwert {2} zur\u00fccksetzen wollen?
 configuration.settings.setting.reset.submit=Auf Standardwert zur\u00fccksetzen
+categories.not_found.message=Keine Kategorie f\u00fcr den Identifier {0} gefunden
+categorysystems.not_found.message=Es wurde keine Kategorien f\u00fcr den Identifier {0} gefunden
+categorysystems.label=Kategoriensysteme
+categorysystems.add=Neues Kategoriensystem erstellen
+categorysystems.table.headers.domainKey=Domain Key
+categorysystems.table.headers.uri=URI
+categorysystems.table.headers.version=Version
+categorysystems.table.headers.released=Freigegeben

From 99dfb7949cdc49cd97cd9eeeed19881bb15379f6 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 11 Nov 2020 08:45:08 +0100
Subject: [PATCH 40/93] Some bugfixes

---
 .../java/org/libreccm/ui/admin/categories/CategoriesPage.java  | 3 ++-
 .../ui/admin/categories/CategorySystemDetailsModel.java        | 2 +-
 .../org/libreccm/ui/admin/categories/categorysystems.xhtml     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
index 2297d7d11..7313df8ca 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
@@ -46,7 +46,8 @@ public class CategoriesPage implements AdminPage {
     @Override
     public String getUriIdentifier() {
         return String.format(
-            "%s#getCategorySystems", CategorySystemsController.class.getSimpleName()
+            "%s#getCategorySystems", 
+            CategorySystemsController.class.getSimpleName()
         );
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index 1e7f90bc0..eeee1b129 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -38,7 +38,7 @@ import javax.transaction.Transactional;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
-@Named("CategoryDetailsModel")
+@Named("CategorySystemDetailsModel")
 public class CategorySystemDetailsModel {
 
     private long categorySystemId;
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
index 0cc6aae0b..008163807 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
@@ -25,7 +25,7 @@
             <div class="container">
                 <h1>#{AdminMessages['categorysystems.label']}</h1>
 
-                <div class="text-right">
+                <div class="text-right m-b-2">
                     <a class="btn btn-secondary"
                        href="#{mvc.uri('CategorySystemsController#newCategorySystem')}">
                         <svg class="bi"

From 57f6e90c56d6f4a2a28be414a5d28e240106bd23 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 11 Nov 2020 14:59:52 +0100
Subject: [PATCH 41/93] Category Systems create and list

---
 .../CategorySystemDetailsModel.java           |  4 +
 .../CategorySystemFormController.java         | 11 ++-
 .../categories/CategorySystemsController.java | 42 +++++------
 .../categories/CategorySystemsTableModel.java | 31 ++++----
 .../categories/categorysystem-form.xhtml      | 74 +++++++++++++++++--
 .../ui/admin/categories/categorysystems.xhtml |  4 +-
 .../admin/users-groups-roles/user-form.xhtml  |  2 +-
 .../org/libreccm/ui/AdminBundle.properties    |  9 +++
 .../org/libreccm/ui/AdminBundle_de.properties |  9 +++
 9 files changed, 138 insertions(+), 48 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index eeee1b129..cdca584c8 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -89,6 +89,10 @@ public class CategorySystemDetailsModel {
         return Collections.unmodifiableList(owners);
     }
 
+    public boolean isNew() {
+        return categorySystemId == 0;
+    }
+    
     public List<Message> getMessages() {
         return Collections.unmodifiableList(messages);
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
index bb3acf256..42130136a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
@@ -57,6 +57,9 @@ public class CategorySystemFormController {
     @Inject
     private CategorySystemDetailsModel categorySystemDetailsModel;
 
+    @Inject
+    private DomainManager domainManager;
+    
     @Inject
     private DomainRepository domainRepository;
 
@@ -75,17 +78,17 @@ public class CategorySystemFormController {
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
     public String createCategorySystem() {
-        final Domain domain = new Domain();
-        domain.setDomainKey(domainKey);
+        
+        final Domain domain = domainManager.createDomain(domainKey, domainKey);
+        
         domain.setUri(uri);
-
         domainRepository.save(domain);
 
         return "redirect:/categorymanager/categorysystems";
     }
 
     @POST
-    @Path("/{categorySystemIdentifier}/edit")
+    @Path("{categorySystemIdentifier}/edit")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
index c061843e8..88f64eff5 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
@@ -54,7 +54,7 @@ import javax.ws.rs.PathParam;
  */
 @RequestScoped
 @Controller
-@Path("/categorymanager")
+@Path("/categorymanager/categorysystems")
 public class CategorySystemsController {
 
     @Inject
@@ -78,16 +78,16 @@ public class CategorySystemsController {
     @Inject
     private Models models;
 
-    @GET
-    @Path("/")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getCategoryManager() {
-        return getCategorySystems();
-    }
+//    @GET
+//    @Path("/")
+//    @AuthorizationRequired
+//    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+//    public String getCategoryManager() {
+//        return getCategorySystems();
+//    }
 
     @GET
-    @Path("/categorysystems")
+    @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String getCategorySystems() {
@@ -95,7 +95,7 @@ public class CategorySystemsController {
     }
 
     @GET
-    @Path("/categorysystems/{categorySystemIdentifier}/details")
+    @Path("/{categorySystemIdentifier}/details")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
@@ -144,7 +144,7 @@ public class CategorySystemsController {
     }
 
     @GET
-    @Path("/categorysystems/new")
+    @Path("/new")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String newCategorySystem() {
@@ -152,7 +152,7 @@ public class CategorySystemsController {
     }
 
     @GET
-    @Path("/categorysystems/{categorySystemIdentifier}/edit")
+    @Path("/{categorySystemIdentifier}/edit")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
@@ -201,7 +201,7 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/categorysystems/{categorySystemIdentifier}/delete")
+    @Path("/{categorySystemIdentifier}/delete")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
@@ -253,7 +253,7 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/categorysystems/{categorySystemIdentifier}/title/add")
+    @Path("/{categorySystemIdentifier}/title/add")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String addTitle(
@@ -308,7 +308,7 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/categorysystems/{categorySystemIdentifier}/title/${locale}/edit")
+    @Path("/{categorySystemIdentifier}/title/${locale}/edit")
     @AuthorizationRequired
     public String editTitle(
         @PathParam("categorySystemIdentifier")
@@ -362,7 +362,7 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/categorysystems/{categorySystemIdentifier}/title/${locale}/remove")
+    @Path("/{categorySystemIdentifier}/title/${locale}/remove")
     @AuthorizationRequired
     public String removeTitle(
         @PathParam("categorySystemIdentifier")
@@ -415,7 +415,7 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/categorysystems/{categorySystemIdentifier}/description/add")
+    @Path("/{categorySystemIdentifier}/description/add")
     @AuthorizationRequired
     public String addDescription(
         @PathParam("categorySystemIdentifier")
@@ -470,7 +470,7 @@ public class CategorySystemsController {
 
     @POST
     @Path(
-        "/categorysystems/{categorySystemIdentifier}/description/${locale}/edit")
+        "categorysystems/{categorySystemIdentifier}/description/${locale}/edit")
     @AuthorizationRequired
     public String editDescription(
         @PathParam("categorySystemIdentifier")
@@ -525,7 +525,7 @@ public class CategorySystemsController {
 
     @POST
     @Path(
-        "/categorysystems/{categorySystemIdentifier}/description/${locale}/remove")
+        "categorysystems/{categorySystemIdentifier}/description/${locale}/remove")
     @AuthorizationRequired
     public String removeDescription(
         @PathParam("categorySystemIdentifier")
@@ -578,7 +578,7 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/categorysystems/{categorySystemIdentifier}/owners/add")
+    @Path("/{categorySystemIdentifier}/owners/add")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String addOwner(
@@ -650,7 +650,7 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/categorysystems/{categorySystemIdentifier}/owners/remove")
+    @Path("/{categorySystemIdentifier}/owners/remove")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String removeOwner(
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
index c46be2369..a0016b7ba 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
@@ -58,29 +58,32 @@ public class CategorySystemsTableModel {
 
     private CategorySystemTableRow buildTableRow(final Domain domain) {
         final CategorySystemTableRow row = new CategorySystemTableRow();
-        
+
         row.setDomainId(domain.getObjectId());
         row.setDomainKey(domain.getDomainKey());
         row.setUri(domain.getUri());
         row.setVersion(domain.getVersion());
-        row.setReleased(
-            DateTimeFormatter.ISO_DATE_TIME.format(
-                domain.getReleased().toInstant()
-            )
-        );
+        if (domain.getReleased() != null) {
+            row.setReleased(
+                DateTimeFormatter.ISO_DATE_TIME.format(
+                    domain.getReleased().toInstant()
+                )
+            );
+        }
         row.setTitle(
             domain
                 .getTitle()
-            .getValues()
-            .entrySet()
-            .stream()
-            .collect(
-                Collectors.toMap(
-                    entry -> entry.getKey().toString(), 
-                    entry -> entry.getValue()
+                .getValues()
+                .entrySet()
+                .stream()
+                .collect(
+                    Collectors.toMap(
+                        entry -> entry.getKey().toString(),
+                        entry -> entry.getValue()
+                    )
                 )
-            )
         );
         return row;
     }
+
 }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
index f828f658d..39fb0593a 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
@@ -4,22 +4,84 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
-        
+
         <ui:param name="activePage" value="categories" />
         <ui:param name="title" value="#{AdminMessages['categories.label']}" />
-    
+
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item active">
                 #{AdminMessages['categories.label']}
             </li>
+            <li class="breadcrumb-item active">
+                <a href="#{mvc.uri('CategorySystemsController#getCategorySystems')}">
+                    #{AdminMessages['categorysystems.label']}
+                </a>
+            </li>
+            <c:choose>
+                <c:when test="#{CategorySystemDetailsModel.new}">
+                    <li class="breadcrumb-item active">
+                        #{AdminMessages['categorysystems.new.label']}
+                    </li>
+                </c:when>
+                <c:otherwise>
+                    <li class="breadcrumb-item active">
+                        #{CategorySystemDetailsModel.domainKey}
+                    </li>
+                </c:otherwise>
+            </c:choose>
+
         </ui:define>
-        
+
         <ui:define name="main">
             <div class="container">
-                <h1>#{AdminMessages['categories.label']}</h1>
-                <p>ToDo</p>
+                <h1>#{CategorySystemDetailsModel.new ? AdminMessages['categorysystems.new.label'] : AdminMessages.getMessage('categorysystems.edit.label', CategorySystemDetailsModel.domainKey)}</h1>
+
+                <form action="#{CategorySystemDetailsModel.new ? mvc.uri('CategorySystemFormController#createCategorySystem') : mvc.uri('CategorySystemFormController#updateCategorySystem', {'categorySystemIdentifier': CategoryDetailsModel.domainKey })}"
+                      method="post">
+                    <div class="form-group">
+                        <label for="domainKey">
+                            #{AdminMessages['categorysystems.form.domainKey.label']}
+                        </label>
+                        <input aria-describedby="domainKey-help"
+                               class="form-control"
+                               name="domainKey"
+                               type="text" />
+                        <small class="form-text text-muted"
+                               id="domainKey-help">
+                            #{AdminMessages['categorysystems.form.domainKey.help']}
+                        </small>
+                    </div>
+                    <div class="form-group">
+                        <label for="uri">
+                            #{AdminMessages['categorysystems.form.uri.label']}
+                        </label>
+                        <input aria-describedby="uri-help"
+                               class="form-control"
+                               name="domainKey"
+                               type="text" />
+                        <small class="form-text text-muted"
+                               id="domainKey-help">
+                            #{AdminMessages['categorysystems.form.uri.help']}
+                        </small>
+                    </div>
+                    <a class="btn btn-warning" 
+                       href="#{mvc.uri('CategorySystemsController#getCategorySystems')}">
+                        #{AdminMessages['categorysystems.form.buttons.cancel']}
+                    </a>
+                    <button class="btn btn-success" type="submit">
+                        <c:choose>
+                            <c:when test="#{UserDetailsModel.newUser}">
+                                #{AdminMessages['categorysystems.form.buttons.create']}
+                            </c:when>
+                            <c:otherwise>
+                                #{AdminMessages['categorysystems.form.buttons.save']}
+                            </c:otherwise>
+                        </c:choose>
+                    </button>
+                </form>
+
             </div>
         </ui:define>
-    
+
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
index 008163807..a5856832f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
@@ -25,7 +25,7 @@
             <div class="container">
                 <h1>#{AdminMessages['categorysystems.label']}</h1>
 
-                <div class="text-right m-b-2">
+                <div class="text-right mb-2">
                     <a class="btn btn-secondary"
                        href="#{mvc.uri('CategorySystemsController#newCategorySystem')}">
                         <svg class="bi"
@@ -51,7 +51,7 @@
                                    var="categorySystem">
                             <tr>
                                 <td>
-                                    <a href="#{mvc.uri('CategorySystemsController#getCategorySystemDetails', categorySystem.identifier)}">
+                                    <a href="#{mvc.uri('CategorySystemsController#getCategorySystemDetails', { 'categorySystemIdentifier': categorySystem.identifier })}">
                                     #{categorySystem.domainKey}
                                     </a>
                                 </td>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
index 23ebc7a44..d19034fdc 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/user-form.xhtml
@@ -43,7 +43,7 @@
                     <label for="username">
                         #{AdminMessages['usersgroupsroles.users.form.username.label']}
                     </label>
-                    <input aria-described-by="username-help"
+                    <input aria-describedby="username-help"
                            class="form-control" 
                            id="username" 
                            name="userName" 
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index cb8c4676a..8d26b2493 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -248,3 +248,12 @@ categorysystems.table.headers.domainKey=Domain Key
 categorysystems.table.headers.uri=URI
 categorysystems.table.headers.version=Version
 categorysystems.table.headers.released=Released
+categorysystems.new.label=Create new categorysystem
+categorysystems.edit.label=Edit Category System {0}
+categorysystems.form.domainKey.label=Domain Key
+categorysystems.form.domainKey.help=Unique key for category system
+categorysystems.form.uri.label=URI
+categorysystems.form.uri.help=URI stub of the categorysystem
+categorysystems.form.buttons.create=Create new categorysystem
+categorysystems.form.buttons.save=Apply changes
+categorysystems.form.buttons.cancel=Cancel
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 1385f1a99..ee3e0826c 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -248,3 +248,12 @@ categorysystems.table.headers.domainKey=Domain Key
 categorysystems.table.headers.uri=URI
 categorysystems.table.headers.version=Version
 categorysystems.table.headers.released=Freigegeben
+categorysystems.new.label=Neues Kategoriensystem erstellen
+categorysystems.edit.label=Kategoriensystem {0} bearbeiten
+categorysystems.form.domainKey.label=Domain Key
+categorysystems.form.domainKey.help=Unique key for category system
+categorysystems.form.uri.label=URI
+categorysystems.form.uri.help=URI stub of the categorysystem
+categorysystems.form.buttons.create=Neues Kategoriensystem anlegen
+categorysystems.form.buttons.save=\u00c4nderungen anwenden
+categorysystems.form.buttons.cancel=Abbrechen

From 3e52a0fae27d70b1cacf36695ad4591bd3e68493 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 11 Nov 2020 17:51:21 +0100
Subject: [PATCH 42/93] Details View for category systems

---
 .../categories/categorysystem-details.xhtml   | 271 +++++++++++++++++-
 .../categories/categorysystem-not-found.xhtml |  18 +-
 .../org/libreccm/ui/AdminBundle.properties    |  29 ++
 .../org/libreccm/ui/AdminBundle_de.properties |  31 +-
 4 files changed, 334 insertions(+), 15 deletions(-)

diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index f828f658d..210e8e6c1 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -2,24 +2,279 @@
 <html xmlns="http://www.w3.org/1999/xhtml" 
       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:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:xlink="http://www.w3.org/1999/xlink">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
-        
+
         <ui:param name="activePage" value="categories" />
         <ui:param name="title" value="#{AdminMessages['categories.label']}" />
-    
+
         <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('CategorySystemsController#getCategorySystems')}">
+                    #{AdminMessages['categories.label']}
+                </a>
+            </li>
             <li class="breadcrumb-item active">
-                #{AdminMessages['categories.label']}
+                #{CategorySystemDetailsModel.domainKey}
             </li>
         </ui:define>
-        
+
         <ui:define name="main">
             <div class="container">
-                <h1>#{AdminMessages['categories.label']}</h1>
-                <p>ToDo</p>
+                <h1>#{AdminMessages.getMessage('categorysystems.details.title', [CategorySystemsDetailsModel.domainKey])}</h1>
+
+                <dl>
+                    <div>
+                        <dt>
+                            #{AdminMessages['categorysystems.details.id']}
+                        </dt>
+                        <dd>
+                            #{CategorySystemDetailsModel.categorySystemId}
+                        </dd>
+                    </div>
+                    <div>
+                        <dt>
+                            #{AdminMessages['categorysystems.details.uuid']}
+                        </dt>
+                        <dd>
+                            #{CategorySystemDetailsModel.uuid}
+                        </dd>
+                    </div>
+                    <div>
+                        <dt>
+                            #{AdminMessages['categorysystems.details.domainKey']}
+                        </dt>
+                        <dd>
+                            #{CategorySystemDetailsModel.domainKey}
+                        </dd>
+                    </div>
+                    <div>
+                        <dt>
+                            #{AdminMessages['categorysystems.details.uri']}
+                        </dt>
+                        <dd>
+                            #{CategorySystemDetailsModel.uri}
+                        </dd>
+                    </div>
+                </dl>
+
+                <h2>
+                    #{AdminMessages['categorysystems.details.title.heading']}
+                </h2>
+                <div class="text-right mb-2">
+                    <a class="btn btn-secondary"
+                       href="#">
+                        <svg class="bi"
+                             width="1em"
+                             height="1em"
+                             fill="currentColor">
+                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#circle-plus" />
+                        </svg>
+                        <span>#{AdminMessages['categorysystems.details.title.add']}</span>
+                    </a>
+                </div>
+                <c:choose>
+
+                    <c:when test="#{CategorySystemDetailsModel.getTitle().isEmpty()}">
+                        <p>
+                            #{AdminMessages['categorysystems.details.title.none']}
+                        </p>
+                    </c:when>
+                    <c:otherwise>
+                        <table class="table table-hover">
+                            <thead class="thead-light">
+                                <tr>
+                                    <th scope="col">#{AdminMessages['categorysystems.details.title.table.headings.locale']}</th>
+                                    <th scope="col">#{AdminMessages['categorysystems.details.title.table.headings.value']}</th>
+                                    <th class="text-center" 
+                                        colspan="2" 
+                                        scope="col">#{AdminMessages['categorysystems.details.title.table.headings.actions']}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <c:forEach items="#{CategorySystemDetailsModel.title}"
+                                           var="entry">
+                                    <tr>
+                                        <td>
+                                            #{entry.key}
+                                        </td>
+                                        <td>
+                                            #{entry.value}
+                                        </td>
+                                        <td>
+                                            <button class="btn btn-primary"
+                                                    type="button">
+                                                <svg class="bi"
+                                                     width="1em"
+                                                     height="1em"
+                                                     fill="currentColor">
+                                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                                                </svg>
+                                                <span>#{AdminMessages['categorysystems.details.title.table.actions.edit']}</span>
+                                            </button>
+                                        </td>
+                                        <td>
+                                            <button class="btn btn-danger"
+                                                    type="button">
+                                                <svg class="bi"
+                                                     width="1em"
+                                                     height="1em"
+                                                     fill="currentColor">
+                                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                                </svg>
+                                                <span>#{AdminMessages['categorysystems.details.title.table.actions.remove']}</span>
+                                            </button>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </tbody>
+                        </table>
+                    </c:otherwise>
+                </c:choose>
+
+                <h2>
+                    #{AdminMessages['categorysystems.details.description.heading']}
+                </h2>
+                <div class="text-right mb-2">
+                    <a class="btn btn-secondary"
+                       href="
+                       ">
+                        <svg class="bi"
+                             width="1em"
+                             height="1em"
+                             fill="currentColor">
+                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#circle-plus" />
+                        </svg>
+                        <span>#{AdminMessages['categorysystems.details.description.add']}</span>
+                    </a>
+                </div>
+                <c:choose>
+
+                    <c:when test="#{CategorySystemDetailsModel.getDescription().isEmpty()}">
+                        <p>
+                            #{AdminMessages['categorysystems.details.description.none']}
+                        </p>
+                    </c:when>
+                    <c:otherwise>
+                        <table class="table table-hover">
+                            <thead class="thead-light">
+                                <tr>
+                                    <th scope="col">#{AdminMessages['categorysystems.details.description.table.headings.locale']}</th>
+                                    <th scope="col">#{AdminMessages['categorysystems.details.description.table.headings.value']}</th>
+                                    <th class="text-center" 
+                                        colspan="2" 
+                                        scope="col">#{AdminMessages['categorysystems.details.description.table.headings.actions']}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <c:forEach items="#{CategorySystemDetailsModel.title}"
+                                           var="entry">
+                                    <tr>
+                                        <td>
+                                            #{entry.key}
+                                        </td>
+                                        <td>
+                                            #{entry.value}
+                                        </td>
+                                        <td>
+                                            <button class="btn btn-primary"
+                                                    type="button">
+                                                <svg class="bi"
+                                                     width="1em"
+                                                     height="1em"
+                                                     fill="currentColor">
+                                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                                                </svg>
+                                                <span>#{AdminMessages['categorysystems.details.description.table.actions.edit']}</span>
+                                            </button>
+                                        </td>
+                                        <td>
+                                            <button class="btn btn-danger"
+                                                    type="button">
+                                                <svg class="bi"
+                                                     width="1em"
+                                                     height="1em"
+                                                     fill="currentColor">
+                                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                                </svg>
+                                                <span>#{AdminMessages['categorysystems.details.description.table.actions.remove']}</span>
+                                            </button>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </tbody>
+                        </table>
+                    </c:otherwise>
+                </c:choose>
+
+                <h2>
+                    #{AdminMessages['categorysystems.details.owners.heading']}
+                </h2>
+                <div class="text-right mb-2">
+                    <a class="btn btn-secondary"
+                       href="
+                       ">
+                        <svg class="bi"
+                             width="1em"
+                             height="1em"
+                             fill="currentColor">
+                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#circle-plus" />
+                        </svg>
+                        <span>#{AdminMessages['categorysystems.details.owners.add']}</span>
+                    </a>
+                </div>
+                <c:choose>
+                    <c:when test="#{CategorySystemDetailsModel.getOwners().isEmpty()}">
+                        <p>
+                            #{AdminMessages['categorysystems.details.owners.none']}
+                        </p>
+                    </c:when>
+                    <c:otherwise>
+                        <table>
+                            <thead>
+                                <tr>
+                                    <th>
+                                        #{AdminMessages['categorysystems.details.owners.applicationname']}
+                                    </th>
+                                    <th>
+                                        #{AdminMessages['categorysystems.details.owners.context']}
+                                    </th>
+                                    <th>
+                                        #{AdminMessages['categorysystems.details.owners.actions']}
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <c:forEach items="#{CategorySystemDetailsModel.owners}"
+                                           var="owner">
+                                    <tr>
+                                        <td>
+                                            #{owner.ownerAppName}
+                                        </td>
+                                        <td>
+                                            #{owner.context}
+                                        </td>
+                                        <td>
+                                            <button class="btn btn-danger"
+                                                    type="button">
+                                                <svg class="bi"
+                                                     width="1em"
+                                                     height="1em"
+                                                     fill="currentColor">
+                                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                                </svg>
+                                                <span>#{AdminMessages['categorysystems.details.owners.remove']}</span>
+                                            </button>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </tbody>
+                        </table>
+                    </c:otherwise>
+                </c:choose>
             </div>
         </ui:define>
-    
+
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml
index f828f658d..da2bdcdc1 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml
@@ -4,22 +4,28 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
-        
+
         <ui:param name="activePage" value="categories" />
         <ui:param name="title" value="#{AdminMessages['categories.label']}" />
-    
+
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item active">
                 #{AdminMessages['categories.label']}
             </li>
         </ui:define>
-        
+
         <ui:define name="main">
             <div class="container">
-                <h1>#{AdminMessages['categories.label']}</h1>
-                <p>ToDo</p>
+                <h1>#{AdminMessages['categorysystems.not_found.title']}</h1>
+
+                <c:forEach items="#{CategorySystemDetailsModel.messages}" var="message">
+                    <div class="alert alert-#{message.messageType}" role="alert">
+                        #{message}
+                    </div>
+                </c:forEach>
+
             </div>
         </ui:define>
-    
+
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 8d26b2493..09aa7f369 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -257,3 +257,32 @@ categorysystems.form.uri.help=URI stub of the categorysystem
 categorysystems.form.buttons.create=Create new categorysystem
 categorysystems.form.buttons.save=Apply changes
 categorysystems.form.buttons.cancel=Cancel
+categorysystems.not_found.title=Categorysystem not found
+categorysystems.details.title=Categorysystem {0} Details
+categorysystems.details.id=ID
+categorysystems.details.uuid=UUID
+categorysystems.details.domainKey=Domain Key
+categorysystems.details.uri=URI Stub
+categorysystems.details.title.heading=Localized Title
+categorysystems.details.title.table.headings.locale=Language
+categorysystems.details.title.table.headings.value=Localized Title
+categorysystems.details.title.table.headings.actions=Actions
+categorysystems.details.title.table.actions.edit=Edit
+categorysystems.details.title.table.actions.remove=Remove
+categorysystems.details.title.add=Add title localization
+categorysystems.details.title.none=No localized titles
+categorysystems.details.description.heading=Localized Description
+categorysystems.details.description.table.headings.locale=Language
+categorysystems.details.description.table.headings.value=Localized Description
+categorysystems.details.description.table.headings.actions=Actions
+categorysystems.details.description.table.actions.edit=Edit
+categorysystems.details.description.table.actions.remove=Remove
+categorysystems.details.description.add=Add localized description
+categorysystems.details.description.none=No localized descriptions
+categorysystems.details.owners.add=Add application mapping
+categorysystems.details.owners.applicationname=Application
+categorysystems.details.owners.actions=Actions
+categorysystems.details.owners.remove=Remove
+categorysystems.details.owners.context=Context
+categorysystems.details.owners.heading=Used by
+categorysystems.details.owners.none=Not in use by any application
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index ee3e0826c..8dad8b0d8 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -241,7 +241,7 @@ configuration.settings.setting.reset.close=Abbrechen
 configuration.settings.setting.reset.confirm=Sind Sie sicher, dass die die Einstellung {1} in Konfiguration {0} auf ihren Standardwert {2} zur\u00fccksetzen wollen?
 configuration.settings.setting.reset.submit=Auf Standardwert zur\u00fccksetzen
 categories.not_found.message=Keine Kategorie f\u00fcr den Identifier {0} gefunden
-categorysystems.not_found.message=Es wurde keine Kategorien f\u00fcr den Identifier {0} gefunden
+categorysystems.not_found.message=Es wurde kein Kategoriensystem f\u00fcr den Identifier {0} gefunden
 categorysystems.label=Kategoriensysteme
 categorysystems.add=Neues Kategoriensystem erstellen
 categorysystems.table.headers.domainKey=Domain Key
@@ -257,3 +257,32 @@ categorysystems.form.uri.help=URI stub of the categorysystem
 categorysystems.form.buttons.create=Neues Kategoriensystem anlegen
 categorysystems.form.buttons.save=\u00c4nderungen anwenden
 categorysystems.form.buttons.cancel=Abbrechen
+categorysystems.not_found.title=Kategoriensystem nicht gefunden
+categorysystems.details.title=Kategoriensystem {0} Details
+categorysystems.details.id=ID
+categorysystems.details.uuid=UUID
+categorysystems.details.domainKey=Domain Key
+categorysystems.details.uri=URI Stub
+categorysystems.details.title.heading=Lokalisierter Titel
+categorysystems.details.title.table.headings.locale=Sprache
+categorysystems.details.title.table.headings.value=Lokalisierter Titel
+categorysystems.details.title.table.headings.actions=Aktionen
+categorysystems.details.title.table.actions.edit=Bearbeiten
+categorysystems.details.title.table.actions.remove=Entfernen
+categorysystems.details.title.add=\u00dcbersetzung hinzuf\u00fcgen
+categorysystems.details.title.none=Keine lokalisierten Titel
+categorysystems.details.description.heading=Lokalisierte Beschreibung
+categorysystems.details.description.table.headings.locale=Sprache
+categorysystems.details.description.table.headings.value=Lokalisierte Beschreibung
+categorysystems.details.description.table.headings.actions=Aktionen
+categorysystems.details.description.table.actions.edit=Bearbeiten
+categorysystems.details.description.table.actions.remove=Entfernen
+categorysystems.details.description.add=\u00dcbersetzung hinzuf\u00fcgen
+categorysystems.details.description.none=Keine lokalisierten Beschreibungen
+categorysystems.details.owners.add=Anwendung hinzuf\u00fcgen
+categorysystems.details.owners.applicationname=Anwendung
+categorysystems.details.owners.actions=Aktionen
+categorysystems.details.owners.remove=Entfernen
+categorysystems.details.owners.context=Context
+categorysystems.details.owners.heading=Verwendet von
+categorysystems.details.owners.none=Wird von keiner Anwendung verwendet

From 2c794cd2edcce043709053bdd01d0b2a1574e6b9 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 11 Nov 2020 19:01:03 +0100
Subject: [PATCH 43/93] Edit form for Category Systems

---
 .../categories/CategorySystemDetailsModel.java |  4 ++++
 .../categories/categorysystem-details.xhtml    | 18 +++++++++++++++---
 .../admin/categories/categorysystem-form.xhtml |  9 ++++++---
 .../org/libreccm/ui/AdminBundle.properties     |  1 +
 .../org/libreccm/ui/AdminBundle_de.properties  |  1 +
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index cdca584c8..1f26274ba 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -64,6 +64,10 @@ public class CategorySystemDetailsModel {
     public long getCategorySystemId() {
         return categorySystemId;
     }
+    
+    public String getIdentifier() {
+        return String.format("ID-%d", categorySystemId);
+    }
 
     public String getUuid() {
         return uuid;
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index 210e8e6c1..7746d35c7 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -22,7 +22,7 @@
 
         <ui:define name="main">
             <div class="container">
-                <h1>#{AdminMessages.getMessage('categorysystems.details.title', [CategorySystemsDetailsModel.domainKey])}</h1>
+                <h1>#{AdminMessages.getMessage('categorysystems.details.title', [CategorySystemDetailsModel.domainKey])}</h1>
 
                 <dl>
                     <div>
@@ -58,6 +58,18 @@
                         </dd>
                     </div>
                 </dl>
+                <div class="mb-4">
+                    <a class="btn btn-primary"
+                       href="#{mvc.uri('CategorySystemsController#editCategorySystem', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier } )}">
+                        <svg class="bi"
+                             width="1em"
+                             height="1em"
+                             fill="currentColor">
+                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                        </svg>
+                        <span>#{AdminMessages['categorysystems.details.edit']}</span>
+                    </a>
+                </div>
 
                 <h2>
                     #{AdminMessages['categorysystems.details.title.heading']}
@@ -103,7 +115,7 @@
                                             #{entry.value}
                                         </td>
                                         <td>
-                                            <button class="btn btn-primary"
+                                            <button class="btn btn-info"
                                                     type="button">
                                                 <svg class="bi"
                                                      width="1em"
@@ -178,7 +190,7 @@
                                             #{entry.value}
                                         </td>
                                         <td>
-                                            <button class="btn btn-primary"
+                                            <button class="btn btn-info"
                                                     type="button">
                                                 <svg class="bi"
                                                      width="1em"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
index 39fb0593a..f8a6b68de 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
@@ -34,7 +34,7 @@
 
         <ui:define name="main">
             <div class="container">
-                <h1>#{CategorySystemDetailsModel.new ? AdminMessages['categorysystems.new.label'] : AdminMessages.getMessage('categorysystems.edit.label', CategorySystemDetailsModel.domainKey)}</h1>
+                <h1>#{CategorySystemDetailsModel.new ? AdminMessages['categorysystems.new.label'] : AdminMessages.getMessage('categorysystems.edit.label', [CategorySystemDetailsModel.domainKey])}</h1>
 
                 <form action="#{CategorySystemDetailsModel.new ? mvc.uri('CategorySystemFormController#createCategorySystem') : mvc.uri('CategorySystemFormController#updateCategorySystem', {'categorySystemIdentifier': CategoryDetailsModel.domainKey })}"
                       method="post">
@@ -45,7 +45,8 @@
                         <input aria-describedby="domainKey-help"
                                class="form-control"
                                name="domainKey"
-                               type="text" />
+                               type="text" 
+                               value="#{CategorySystemDetailsModel.domainKey}" />
                         <small class="form-text text-muted"
                                id="domainKey-help">
                             #{AdminMessages['categorysystems.form.domainKey.help']}
@@ -58,7 +59,9 @@
                         <input aria-describedby="uri-help"
                                class="form-control"
                                name="domainKey"
-                               type="text" />
+                               type="text" 
+                               value="#{CategorySystemDetailsModel.uri}"
+                               />
                         <small class="form-text text-muted"
                                id="domainKey-help">
                             #{AdminMessages['categorysystems.form.uri.help']}
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 09aa7f369..049be487c 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -286,3 +286,4 @@ categorysystems.details.owners.remove=Remove
 categorysystems.details.owners.context=Context
 categorysystems.details.owners.heading=Used by
 categorysystems.details.owners.none=Not in use by any application
+categorysystems.details.edit=Edit
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 8dad8b0d8..31d6fb457 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -286,3 +286,4 @@ categorysystems.details.owners.remove=Entfernen
 categorysystems.details.owners.context=Context
 categorysystems.details.owners.heading=Verwendet von
 categorysystems.details.owners.none=Wird von keiner Anwendung verwendet
+categorysystems.details.edit=Bearbeiten

From 6c0a262408e8a786219d553b823316a3660058e2 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 12 Nov 2020 21:06:43 +0100
Subject: [PATCH 44/93] CategorySystem edit form

---
 ccm-core/pom.xml                              |  6 +-
 .../CategorySystemDetailsModel.java           | 68 ++++++++++++++-
 .../CategorySystemFormController.java         | 82 +++++++++++++++++--
 .../categories/categorysystem-details.xhtml   | 16 ++++
 .../categories/categorysystem-form.xhtml      | 37 ++++++++-
 .../org/libreccm/ui/AdminBundle.properties    |  9 +-
 .../org/libreccm/ui/AdminBundle_de.properties |  9 +-
 pom.xml                                       |  5 ++
 src/site/site.xml                             |  2 +-
 9 files changed, 221 insertions(+), 13 deletions(-)

diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 833befc35..76d8f3c02 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -152,6 +152,10 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>oro</groupId>
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index 1f26274ba..bdd3615e9 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -22,8 +22,14 @@ import org.libreccm.categorization.Domain;
 import org.libreccm.categorization.DomainOwnership;
 import org.libreccm.ui.Message;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -49,6 +55,10 @@ public class CategorySystemDetailsModel {
 
     private String uri;
 
+    private String version;
+
+    private String released;
+
     private Map<String, String> title;
 
     private Map<String, String> description;
@@ -65,6 +75,10 @@ public class CategorySystemDetailsModel {
         return categorySystemId;
     }
     
+    protected void setCategorySystemId(final long categorySystemId) {
+        this.categorySystemId = categorySystemId;
+    }
+
     public String getIdentifier() {
         return String.format("ID-%d", categorySystemId);
     }
@@ -72,14 +86,55 @@ public class CategorySystemDetailsModel {
     public String getUuid() {
         return uuid;
     }
+    
+    protected void setUuid(final String uuid) {
+        this.uuid = uuid;
+    }
 
     public String getDomainKey() {
         return domainKey;
     }
+    
+    protected void setDomainKey(final String uuid) {
+        this.uuid = uuid;
+    }
 
     public String getUri() {
         return uri;
     }
+    
+    protected void setUri(final String uri) {
+        this.uri = uri;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    protected void setVersion(final String version) {
+        this.version = version;
+    }
+    
+    public String getReleased() {
+        return released;
+    }
+    
+    protected void setReleased(final String released) {
+        this.released = released;
+    }
+    
+    protected void setReleased(final Date released) {
+        if (released == null) {
+            this.released = "";
+        } else {
+            this.released = DateTimeFormatter.ISO_DATE.format(
+                LocalDateTime.ofInstant(
+                    Instant.ofEpochMilli(released.getTime()),
+                    ZoneOffset.UTC
+                )
+            );
+        }
+    }
 
     public Map<String, String> getTitle() {
         return Collections.unmodifiableMap(title);
@@ -96,7 +151,7 @@ public class CategorySystemDetailsModel {
     public boolean isNew() {
         return categorySystemId == 0;
     }
-    
+
     public List<Message> getMessages() {
         return Collections.unmodifiableList(messages);
     }
@@ -113,6 +168,17 @@ public class CategorySystemDetailsModel {
         uuid = domain.getUuid();
         domainKey = domain.getDomainKey();
         uri = domain.getUri();
+        version = domain.getVersion();
+        if (domain.getReleased() == null) {
+            released = "";
+        } else {
+            released = DateTimeFormatter.ISO_DATE_TIME.format(
+                LocalDateTime.ofInstant(
+                    Instant.ofEpochMilli(domain.getReleased().getTime()),
+                    ZoneOffset.UTC
+                )
+            );
+        }
         title = domain
             .getTitle()
             .getValues()
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
index 42130136a..8d3a88758 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
@@ -18,6 +18,7 @@
  */
 package org.libreccm.ui.admin.categories;
 
+import org.apache.commons.validator.routines.UrlValidator;
 import org.libreccm.api.Identifier;
 import org.libreccm.api.IdentifierParser;
 import org.libreccm.categorization.Domain;
@@ -30,7 +31,18 @@ import org.libreccm.ui.Message;
 import org.libreccm.ui.MessageType;
 import org.libreccm.ui.admin.AdminMessages;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
@@ -59,7 +71,7 @@ public class CategorySystemFormController {
 
     @Inject
     private DomainManager domainManager;
-    
+
     @Inject
     private DomainRepository domainRepository;
 
@@ -72,16 +84,41 @@ public class CategorySystemFormController {
     @FormParam("uri")
     private String uri;
 
+    @FormParam("version")
+    private String version;
+
+    @FormParam("released")
+    private String released;
+
     @POST
     @Path("/new")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
     public String createCategorySystem() {
-        
+
         final Domain domain = domainManager.createDomain(domainKey, domainKey);
-        
+
+        if (!isValidUri(uri)) {
+            categorySystemDetailsModel.setDomainKey(domainKey);
+            categorySystemDetailsModel.setUri(uri);
+            categorySystemDetailsModel.setVersion(version);
+            categorySystemDetailsModel.setReleased(released);
+
+            categorySystemDetailsModel.addMessage(
+                new Message(
+                    adminMessages.get("categorysystems.form.errors.uri_invalid"),
+                    MessageType.PRIMARY)
+            );
+        }
+
         domain.setUri(uri);
+        domain.setVersion(version);
+        if (released == null) {
+            domain.setReleased(null);
+        } else {
+            domain.setReleased(convertReleased());
+        }
         domainRepository.save(domain);
 
         return "redirect:/categorymanager/categorysystems";
@@ -117,13 +154,34 @@ public class CategorySystemFormController {
         }
 
         if (result.isPresent()) {
+            if (!isValidUri(uri)) {
+                categorySystemDetailsModel.setDomainKey(domainKey);
+                categorySystemDetailsModel.setUri(uri);
+                categorySystemDetailsModel.setVersion(version);
+                categorySystemDetailsModel.setReleased(released);
+
+                categorySystemDetailsModel.addMessage(
+                    new Message(
+                        adminMessages.get(
+                            "categorysystems.form.errors.uri_invalid"),
+                        MessageType.PRIMARY)
+                );
+            }
             final Domain domain = result.get();
             domain.setDomainKey(domainKey);
             domain.setUri(uri);
+            domain.setVersion(version);
+            if (released == null) {
+                domain.setReleased(null);
+            } else {
+                domain.setReleased(convertReleased());
+            }
             domainRepository.save(domain);
 
-            categorySystemDetailsModel.setCategorySystem(domain);
-            return "org/libreccm/ui/admin/categories/categorysystem-details.xhtml";
+            return String.format(
+                "redirect:/categorymanager/categorysystems/ID-%d/details",
+                domain.getObjectId()
+            );
         } else {
             categorySystemDetailsModel.addMessage(
                 new Message(
@@ -138,4 +196,18 @@ public class CategorySystemFormController {
         }
     }
 
+    private Date convertReleased() {
+        final String param = String.format("%sT00:00:00", released);
+        return Date.from(
+            LocalDateTime
+                .parse(param, DateTimeFormatter.ISO_DATE_TIME)
+                .toInstant(ZoneOffset.UTC)
+        );
+    }
+
+    private boolean isValidUri(final String uriStr) {
+        final UrlValidator urlValidator = new UrlValidator();
+        return urlValidator.isValid(uri);
+    }
+
 }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index 7746d35c7..b184986f6 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -57,6 +57,22 @@
                             #{CategorySystemDetailsModel.uri}
                         </dd>
                     </div>
+                    <div>
+                        <dt>
+                            #{AdminMessages['categorysystems.details.version']}
+                        </dt>
+                        <dd>
+                            #{CategorySystemDetailsModel.version}
+                        </dd>
+                    </div>
+                    <div>
+                        <dt>
+                            #{AdminMessages['categorysystems.details.released']}
+                        </dt>
+                        <dd>
+                            #{CategorySystemDetailsModel.released}
+                        </dd>
+                    </div>
                 </dl>
                 <div class="mb-4">
                     <a class="btn btn-primary"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
index f8a6b68de..9702f29a2 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
@@ -36,7 +36,7 @@
             <div class="container">
                 <h1>#{CategorySystemDetailsModel.new ? AdminMessages['categorysystems.new.label'] : AdminMessages.getMessage('categorysystems.edit.label', [CategorySystemDetailsModel.domainKey])}</h1>
 
-                <form action="#{CategorySystemDetailsModel.new ? mvc.uri('CategorySystemFormController#createCategorySystem') : mvc.uri('CategorySystemFormController#updateCategorySystem', {'categorySystemIdentifier': CategoryDetailsModel.domainKey })}"
+                <form action="#{CategorySystemDetailsModel.new ? mvc.uri('CategorySystemFormController#createCategorySystem') : mvc.uri('CategorySystemFormController#updateCategorySystem', {'categorySystemIdentifier': CategorySystemDetailsModel.domainKey })}"
                       method="post">
                     <div class="form-group">
                         <label for="domainKey">
@@ -45,6 +45,7 @@
                         <input aria-describedby="domainKey-help"
                                class="form-control"
                                name="domainKey"
+                               required="true"
                                type="text" 
                                value="#{CategorySystemDetailsModel.domainKey}" />
                         <small class="form-text text-muted"
@@ -58,7 +59,7 @@
                         </label>
                         <input aria-describedby="uri-help"
                                class="form-control"
-                               name="domainKey"
+                               name="uri"
                                type="text" 
                                value="#{CategorySystemDetailsModel.uri}"
                                />
@@ -67,13 +68,43 @@
                             #{AdminMessages['categorysystems.form.uri.help']}
                         </small>
                     </div>
+                    <div class="form-group">
+                        <label for="version">
+                            #{AdminMessages['categorysystems.form.version.label']}
+                        </label>
+                        <input aria-describedby="version-help"
+                               class="form-control"
+                               name="version"
+                               type="text" 
+                               value="#{CategorySystemDetailsModel.version}"
+                               />
+                        <small class="form-text text-muted"
+                               id="version-help">
+                            #{AdminMessages['categorysystems.form.version.help']}
+                        </small>
+                    </div>
+                    <div class="form-group">
+                        <label for="released">
+                            #{AdminMessages['categorysystems.form.released.label']}
+                        </label>
+                        <input aria-describedby="released-help"
+                               class="form-control"
+                               name="released"
+                               type="date" 
+                               value="#{CategorySystemDetailsModel.released}"
+                               />
+                        <small class="form-text text-muted"
+                               id="version-help">
+                            #{AdminMessages['categorysystems.form.relased.help']}
+                        </small>
+                    </div>
                     <a class="btn btn-warning" 
                        href="#{mvc.uri('CategorySystemsController#getCategorySystems')}">
                         #{AdminMessages['categorysystems.form.buttons.cancel']}
                     </a>
                     <button class="btn btn-success" type="submit">
                         <c:choose>
-                            <c:when test="#{UserDetailsModel.newUser}">
+                            <c:when test="#{CategorySystemDetailsModel.new}">
                                 #{AdminMessages['categorysystems.form.buttons.create']}
                             </c:when>
                             <c:otherwise>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 049be487c..d81275984 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -262,7 +262,7 @@ categorysystems.details.title=Categorysystem {0} Details
 categorysystems.details.id=ID
 categorysystems.details.uuid=UUID
 categorysystems.details.domainKey=Domain Key
-categorysystems.details.uri=URI Stub
+categorysystems.details.uri=URI
 categorysystems.details.title.heading=Localized Title
 categorysystems.details.title.table.headings.locale=Language
 categorysystems.details.title.table.headings.value=Localized Title
@@ -287,3 +287,10 @@ categorysystems.details.owners.context=Context
 categorysystems.details.owners.heading=Used by
 categorysystems.details.owners.none=Not in use by any application
 categorysystems.details.edit=Edit
+categorysystems.form.version.label=Version
+categorysystems.form.version.help=Version of the category system
+categorysystems.form.relased.help=Date of release
+categorysystems.form.released.label=Released
+categorysystems.details.version=Version
+categorysystems.details.released=Released
+categorysystems.form.errors.uri_invalid=URI is invalid
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 31d6fb457..9664bc61e 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -262,7 +262,7 @@ categorysystems.details.title=Kategoriensystem {0} Details
 categorysystems.details.id=ID
 categorysystems.details.uuid=UUID
 categorysystems.details.domainKey=Domain Key
-categorysystems.details.uri=URI Stub
+categorysystems.details.uri=URI
 categorysystems.details.title.heading=Lokalisierter Titel
 categorysystems.details.title.table.headings.locale=Sprache
 categorysystems.details.title.table.headings.value=Lokalisierter Titel
@@ -287,3 +287,10 @@ categorysystems.details.owners.context=Context
 categorysystems.details.owners.heading=Verwendet von
 categorysystems.details.owners.none=Wird von keiner Anwendung verwendet
 categorysystems.details.edit=Bearbeiten
+categorysystems.form.version.label=Version
+categorysystems.form.version.help=Version des Kategoriensystems
+categorysystems.form.relased.help=Datum der Freigabe
+categorysystems.form.released.label=Released
+categorysystems.details.version=Version
+categorysystems.details.released=Freigegeben
+categorysystems.form.errors.uri_invalid=URI ist nicht valide
diff --git a/pom.xml b/pom.xml
index 017bab17b..abe3fa346 100644
--- a/pom.xml
+++ b/pom.xml
@@ -693,6 +693,11 @@
                 <artifactId>commons-primitives</artifactId>
                 <version>1.0</version>
             </dependency>
+            <dependency>
+                <groupId>commons-validator</groupId>
+                <artifactId>commons-validator</artifactId>
+                <version>1.7</version>
+            </dependency>
             <!-- Apache Commons libraries end -->
 
             <!--<dependency>
diff --git a/src/site/site.xml b/src/site/site.xml
index f00406138..1e5e1baf4 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -34,7 +34,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.5</version>
+        <version>1.9</version>
     </skin>
     
 </project>

From a345920db03139ab1928bfce018cf9cef49437f3 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Fri, 13 Nov 2020 07:45:52 +0100
Subject: [PATCH 45/93] Change column type for category_domains.released to
 date

---
 .../h2/V7_0_0_37__change_category_domain_released_to_date.sql    | 1 +
 .../pgsql/V7_0_0_37__change_category_domain_released_to_date.sql | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_37__change_category_domain_released_to_date.sql
 create mode 100644 ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_37__change_category_domain_released_to_date.sql

diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_37__change_category_domain_released_to_date.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_37__change_category_domain_released_to_date.sql
new file mode 100644
index 000000000..3717f43ab
--- /dev/null
+++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_37__change_category_domain_released_to_date.sql
@@ -0,0 +1 @@
+alter table CCM_CORE.CATEGORY_DOMAINS alter column RELEASED type date;
\ No newline at end of file
diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_37__change_category_domain_released_to_date.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_37__change_category_domain_released_to_date.sql
new file mode 100644
index 000000000..3717f43ab
--- /dev/null
+++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_37__change_category_domain_released_to_date.sql
@@ -0,0 +1 @@
+alter table CCM_CORE.CATEGORY_DOMAINS alter column RELEASED type date;
\ No newline at end of file

From 4454f563874d1b4d4be06a953b0de9c8cda6d1ca Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Fri, 13 Nov 2020 07:46:24 +0100
Subject: [PATCH 46/93] Use java.time.LocalDate instead of java.util.Date for
 Domain#released

---
 .../ui/admin/categories/DomainForm.java       |  7 ++--
 .../org/libreccm/categorization/Domain.java   | 33 ++++++++++---------
 .../CategorySystemDetailsModel.java           | 33 ++++++++-----------
 .../CategorySystemFormController.java         | 25 +++++---------
 .../categories/CategorySystemsTableModel.java |  2 +-
 .../scripts/002_create_ccm_core_tables.sql    |  2 +-
 .../scripts/002_create_ccm_core_tables.sql    |  2 +-
 7 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainForm.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainForm.java
index 3e2e6ff93..f5204dafb 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainForm.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainForm.java
@@ -35,6 +35,8 @@ import org.libreccm.categorization.DomainManager;
 import org.libreccm.categorization.DomainRepository;
 import org.libreccm.cdi.utils.CdiUtil;
 
+import java.time.LocalDate;
+
 import static com.arsdigita.ui.admin.AdminUiConstants.*;
 
 /**
@@ -187,7 +189,8 @@ class DomainForm extends Form {
                 }
                 final String versionData = data.getString(VERSION);
                 final java.util.Date releasedData = (java.util.Date) data.get(
-                    RELEASED);
+                    RELEASED
+                );
                 final String rootCategoryNameData = data.getString(
                     ROOT_CATEGORY_NAME);
 
@@ -207,7 +210,7 @@ class DomainForm extends Form {
                 domain.setDomainKey(domainKeyData);
                 domain.setUri(domainUriData);
                 domain.setVersion(versionData);
-                domain.setReleased(releasedData);
+                domain.setReleased(LocalDate.from(releasedData.toInstant()));
 
                 domainRepository.save(domain);
             }
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
index de95bee8f..109446a17 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
@@ -42,6 +42,9 @@ import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
 import org.libreccm.imexport.Exportable;
 
+import java.text.DateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -196,9 +199,9 @@ public class Domain extends CcmObject implements Serializable, Exportable {
      * A timestamp for the release date of the {@code Domain}.
      */
     @Column(name = "RELEASED")
-    @Temporal(TemporalType.TIMESTAMP)
+//    @Temporal(TemporalType.TIMESTAMP)
     @XmlElement(name = "released", namespace = CAT_XML_NS)
-    private Date released;
+    private LocalDate released;
 
     /**
      * The root category of the domain.
@@ -267,20 +270,12 @@ public class Domain extends CcmObject implements Serializable, Exportable {
         this.version = version;
     }
 
-    public Date getReleased() {
-        if (released == null) {
-            return null;
-        } else {
-            return new Date(released.getTime());
-        }
+    public LocalDate getReleased() {
+        return released;
     }
 
-    public void setReleased(final Date released) {
-        if (released == null) {
-            this.released = null;
-        } else {
-            this.released = new Date(released.getTime());
-        }
+    public void setReleased(final LocalDate released) {
+        this.released = released;
     }
 
     public Category getRoot() {
@@ -399,18 +394,24 @@ public class Domain extends CcmObject implements Serializable, Exportable {
 
     @Override
     public String toString(final String data) {
+        final String releasedStr;
+        if (released == null) {
+            releasedStr = "";
+        } else {
+            releasedStr = DateTimeFormatter.ISO_DATE.format(released);
+        }
         return String.format(
             ", domainKey = \"%s\", "
                 + "uri = \"%s\", "
                 + "title = \"%s\", "
                 + "version = \"%s\", "
-                + "released = %tF %<tT, "
+                + "released = %s, "
                 + "root = \"%s\"%s",
             domainKey,
             Objects.toString(uri),
             Objects.toString(title),
             version,
-            released,
+            releasedStr,
             Objects.toString(root),
             data
         );
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index bdd3615e9..ae02093de 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -23,6 +23,7 @@ import org.libreccm.categorization.DomainOwnership;
 import org.libreccm.ui.Message;
 
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -74,7 +75,7 @@ public class CategorySystemDetailsModel {
     public long getCategorySystemId() {
         return categorySystemId;
     }
-    
+
     protected void setCategorySystemId(final long categorySystemId) {
         this.categorySystemId = categorySystemId;
     }
@@ -86,7 +87,7 @@ public class CategorySystemDetailsModel {
     public String getUuid() {
         return uuid;
     }
-    
+
     protected void setUuid(final String uuid) {
         this.uuid = uuid;
     }
@@ -94,7 +95,7 @@ public class CategorySystemDetailsModel {
     public String getDomainKey() {
         return domainKey;
     }
-    
+
     protected void setDomainKey(final String uuid) {
         this.uuid = uuid;
     }
@@ -102,7 +103,7 @@ public class CategorySystemDetailsModel {
     public String getUri() {
         return uri;
     }
-    
+
     protected void setUri(final String uri) {
         this.uri = uri;
     }
@@ -114,25 +115,20 @@ public class CategorySystemDetailsModel {
     protected void setVersion(final String version) {
         this.version = version;
     }
-    
+
     public String getReleased() {
         return released;
     }
-    
+
     protected void setReleased(final String released) {
         this.released = released;
     }
-    
-    protected void setReleased(final Date released) {
+
+    protected void setReleased(final LocalDate released) {
         if (released == null) {
             this.released = "";
         } else {
-            this.released = DateTimeFormatter.ISO_DATE.format(
-                LocalDateTime.ofInstant(
-                    Instant.ofEpochMilli(released.getTime()),
-                    ZoneOffset.UTC
-                )
-            );
+            this.released = DateTimeFormatter.ISO_DATE.format(released);
         }
     }
 
@@ -172,12 +168,9 @@ public class CategorySystemDetailsModel {
         if (domain.getReleased() == null) {
             released = "";
         } else {
-            released = DateTimeFormatter.ISO_DATE_TIME.format(
-                LocalDateTime.ofInstant(
-                    Instant.ofEpochMilli(domain.getReleased().getTime()),
-                    ZoneOffset.UTC
-                )
-            );
+            released = DateTimeFormatter.ISO_DATE_TIME
+                .withZone(ZoneOffset.systemDefault())
+                .format(domain.getReleased());
         }
         title = domain
             .getTitle()
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
index 8d3a88758..c12933d00 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
@@ -31,18 +31,10 @@ import org.libreccm.ui.Message;
 import org.libreccm.ui.MessageType;
 import org.libreccm.ui.admin.AdminMessages;
 
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAccessor;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
@@ -99,7 +91,7 @@ public class CategorySystemFormController {
 
         final Domain domain = domainManager.createDomain(domainKey, domainKey);
 
-        if (!isValidUri(uri)) {
+        if (!isValidUri()) {
             categorySystemDetailsModel.setDomainKey(domainKey);
             categorySystemDetailsModel.setUri(uri);
             categorySystemDetailsModel.setVersion(version);
@@ -154,7 +146,7 @@ public class CategorySystemFormController {
         }
 
         if (result.isPresent()) {
-            if (!isValidUri(uri)) {
+            if (!isValidUri()) {
                 categorySystemDetailsModel.setDomainKey(domainKey);
                 categorySystemDetailsModel.setUri(uri);
                 categorySystemDetailsModel.setVersion(version);
@@ -166,6 +158,7 @@ public class CategorySystemFormController {
                             "categorysystems.form.errors.uri_invalid"),
                         MessageType.PRIMARY)
                 );
+                return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
             }
             final Domain domain = result.get();
             domain.setDomainKey(domainKey);
@@ -196,16 +189,14 @@ public class CategorySystemFormController {
         }
     }
 
-    private Date convertReleased() {
-        final String param = String.format("%sT00:00:00", released);
-        return Date.from(
-            LocalDateTime
-                .parse(param, DateTimeFormatter.ISO_DATE_TIME)
-                .toInstant(ZoneOffset.UTC)
+    private LocalDate convertReleased() {
+        return LocalDate.parse(
+            released,
+            DateTimeFormatter.ISO_DATE.withZone(ZoneOffset.systemDefault())
         );
     }
 
-    private boolean isValidUri(final String uriStr) {
+    private boolean isValidUri() {
         final UrlValidator urlValidator = new UrlValidator();
         return urlValidator.isValid(uri);
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
index a0016b7ba..9195f8ed4 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
@@ -66,7 +66,7 @@ public class CategorySystemsTableModel {
         if (domain.getReleased() != null) {
             row.setReleased(
                 DateTimeFormatter.ISO_DATE_TIME.format(
-                    domain.getReleased().toInstant()
+                    domain.getReleased()
                 )
             );
         }
diff --git a/ccm-core/src/test/resources-wildfly-h2mem/scripts/002_create_ccm_core_tables.sql b/ccm-core/src/test/resources-wildfly-h2mem/scripts/002_create_ccm_core_tables.sql
index ddba5e676..47b6a8669 100644
--- a/ccm-core/src/test/resources-wildfly-h2mem/scripts/002_create_ccm_core_tables.sql
+++ b/ccm-core/src/test/resources-wildfly-h2mem/scripts/002_create_ccm_core_tables.sql
@@ -54,7 +54,7 @@
 
     create table CCM_CORE.CATEGORY_DOMAINS (
         DOMAIN_KEY varchar(255) not null,
-        RELEASED timestamp,
+        RELEASED date,
         URI varchar(1024),
         VERSION varchar(255),
         OBJECT_ID bigint not null,
diff --git a/ccm-core/src/test/resources-wildfly-pgsql/scripts/002_create_ccm_core_tables.sql b/ccm-core/src/test/resources-wildfly-pgsql/scripts/002_create_ccm_core_tables.sql
index a1b40403c..971ee5f8f 100644
--- a/ccm-core/src/test/resources-wildfly-pgsql/scripts/002_create_ccm_core_tables.sql
+++ b/ccm-core/src/test/resources-wildfly-pgsql/scripts/002_create_ccm_core_tables.sql
@@ -48,7 +48,7 @@
 
     create table CCM_CORE.CATEGORY_DOMAINS (
         DOMAIN_KEY varchar(255) not null,
-        RELEASED timestamp,
+        RELEASED date,
         URI varchar(1024),
         VERSION varchar(255),
         OBJECT_ID int8 not null,

From 98546894c0d8810428a266988e5ee06648958ad7 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@goolemail.com>
Date: Fri, 13 Nov 2020 10:17:07 +0100
Subject: [PATCH 47/93] Category System Edit form

---
 .../main/java/org/libreccm/ui/Message.java    |  4 +++
 .../CategorySystemDetailsModel.java           | 25 ++++++++++++++-----
 .../CategorySystemFormController.java         | 10 +++++---
 .../categories/categorysystem-form.xhtml      |  6 +++++
 .../ui/admin/categories/categorysystems.xhtml |  2 +-
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/Message.java b/ccm-core/src/main/java/org/libreccm/ui/Message.java
index 06bab7d56..dee8912d5 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/Message.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/Message.java
@@ -47,5 +47,9 @@ public class Message {
     public MessageType getMessageType() {
         return messageType;
     }
+    
+    public String getMessageTypeClass() {
+        return messageType.toString().toLowerCase();
+    }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index ae02093de..60cea6cd9 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -22,18 +22,16 @@ import org.libreccm.categorization.Domain;
 import org.libreccm.categorization.DomainOwnership;
 import org.libreccm.ui.Message;
 
-import java.time.Instant;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
@@ -67,9 +65,12 @@ public class CategorySystemDetailsModel {
     private List<CategorySystemOwnerRow> owners;
 
     private final List<Message> messages;
+    
+    private Set<String> invalidFields;
 
     public CategorySystemDetailsModel() {
         messages = new ArrayList<>();
+        invalidFields = new HashSet<>();
     }
 
     public long getCategorySystemId() {
@@ -96,8 +97,8 @@ public class CategorySystemDetailsModel {
         return domainKey;
     }
 
-    protected void setDomainKey(final String uuid) {
-        this.uuid = uuid;
+    protected void setDomainKey(final String domainKey) {
+        this.domainKey = domainKey;
     }
 
     public String getUri() {
@@ -155,6 +156,18 @@ public class CategorySystemDetailsModel {
     public void addMessage(final Message message) {
         messages.add(message);
     }
+    
+    public Set<String> getInvalidFields() {
+        return Collections.unmodifiableSet(invalidFields);
+    }
+    
+    protected void addInvalidField(final String invalidField) {
+        invalidFields.add(invalidField);
+    }
+    
+    protected void setInvalidFields(final Set<String> invalidFields) {
+        this.invalidFields = new HashSet<>(invalidFields);
+    }
 
     @Transactional(Transactional.TxType.REQUIRED)
     protected void setCategorySystem(final Domain domain) {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
index c12933d00..fa1daccaf 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
@@ -89,8 +89,6 @@ public class CategorySystemFormController {
     @Transactional(Transactional.TxType.REQUIRED)
     public String createCategorySystem() {
 
-        final Domain domain = domainManager.createDomain(domainKey, domainKey);
-
         if (!isValidUri()) {
             categorySystemDetailsModel.setDomainKey(domainKey);
             categorySystemDetailsModel.setUri(uri);
@@ -102,11 +100,14 @@ public class CategorySystemFormController {
                     adminMessages.get("categorysystems.form.errors.uri_invalid"),
                     MessageType.PRIMARY)
             );
+            categorySystemDetailsModel.addInvalidField("uri");
+            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
         }
 
+        final Domain domain = domainManager.createDomain(domainKey, domainKey);
         domain.setUri(uri);
         domain.setVersion(version);
-        if (released == null) {
+        if (released == null || released.isEmpty()) {
             domain.setReleased(null);
         } else {
             domain.setReleased(convertReleased());
@@ -158,13 +159,14 @@ public class CategorySystemFormController {
                             "categorysystems.form.errors.uri_invalid"),
                         MessageType.PRIMARY)
                 );
+                categorySystemDetailsModel.addInvalidField("uri");
                 return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
             }
             final Domain domain = result.get();
             domain.setDomainKey(domainKey);
             domain.setUri(uri);
             domain.setVersion(version);
-            if (released == null) {
+            if (released == null || released.isEmpty()) {
                 domain.setReleased(null);
             } else {
                 domain.setReleased(convertReleased());
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
index 9702f29a2..781d5f8d9 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
@@ -36,6 +36,12 @@
             <div class="container">
                 <h1>#{CategorySystemDetailsModel.new ? AdminMessages['categorysystems.new.label'] : AdminMessages.getMessage('categorysystems.edit.label', [CategorySystemDetailsModel.domainKey])}</h1>
 
+                <c:forEach items="#{CategorySystemDetailsModel.messages}" var="message">
+                    <div class="alert alert-#{message.messageTypeClass}" role="alert">
+                        #{message.message}
+                    </div>
+                </c:forEach>
+
                 <form action="#{CategorySystemDetailsModel.new ? mvc.uri('CategorySystemFormController#createCategorySystem') : mvc.uri('CategorySystemFormController#updateCategorySystem', {'categorySystemIdentifier': CategorySystemDetailsModel.domainKey })}"
                       method="post">
                     <div class="form-group">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
index a5856832f..f9dec4e84 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+    <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"

From 313951fca2ecece03b05702ae51fe010393c1492 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 14 Nov 2020 11:46:05 +0100
Subject: [PATCH 48/93] Category System Edit

---
 .../org/libreccm/categorization/Domain.java   |  6 --
 .../CategorySystemDetailsModel.java           |  2 +-
 .../CategorySystemFormController.java         |  4 +-
 .../categories/CategorySystemsTableModel.java |  7 +-
 .../categories/categorysystem-form.xhtml      |  8 +-
 .../ui/admin/categories/categorysystems.xhtml | 77 +++++++++++++++++--
 .../ui/admin/users-groups-roles/groups.xhtml  |  3 +-
 .../org/libreccm/ui/AdminBundle.properties    |  7 ++
 .../org/libreccm/ui/AdminBundle_de.properties |  7 ++
 9 files changed, 96 insertions(+), 25 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
index 109446a17..be258a0ad 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
@@ -42,12 +42,10 @@ import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
 import org.libreccm.imexport.Exportable;
 
-import java.text.DateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -66,8 +64,6 @@ import javax.persistence.NamedQuery;
 import javax.persistence.NamedSubgraph;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 import javax.validation.constraints.NotBlank;
 
 /**
@@ -191,7 +187,6 @@ public class Domain extends CcmObject implements Serializable, Exportable {
      * A version string for the {@code Domain}.
      */
     @Column(name = "VERSION", nullable = true)
-    @NotBlank
     @XmlElement(name = "version", namespace = CAT_XML_NS)
     private String version;
 
@@ -199,7 +194,6 @@ public class Domain extends CcmObject implements Serializable, Exportable {
      * A timestamp for the release date of the {@code Domain}.
      */
     @Column(name = "RELEASED")
-//    @Temporal(TemporalType.TIMESTAMP)
     @XmlElement(name = "released", namespace = CAT_XML_NS)
     private LocalDate released;
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index 60cea6cd9..5d88c690e 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -181,7 +181,7 @@ public class CategorySystemDetailsModel {
         if (domain.getReleased() == null) {
             released = "";
         } else {
-            released = DateTimeFormatter.ISO_DATE_TIME
+            released = DateTimeFormatter.ISO_DATE
                 .withZone(ZoneOffset.systemDefault())
                 .format(domain.getReleased());
         }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
index fa1daccaf..b476c6015 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
@@ -98,7 +98,7 @@ public class CategorySystemFormController {
             categorySystemDetailsModel.addMessage(
                 new Message(
                     adminMessages.get("categorysystems.form.errors.uri_invalid"),
-                    MessageType.PRIMARY)
+                    MessageType.DANGER)
             );
             categorySystemDetailsModel.addInvalidField("uri");
             return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
@@ -157,7 +157,7 @@ public class CategorySystemFormController {
                     new Message(
                         adminMessages.get(
                             "categorysystems.form.errors.uri_invalid"),
-                        MessageType.PRIMARY)
+                        MessageType.DANGER)
                 );
                 categorySystemDetailsModel.addInvalidField("uri");
                 return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
index 9195f8ed4..516bb12be 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
@@ -24,6 +24,7 @@ import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -65,9 +66,9 @@ public class CategorySystemsTableModel {
         row.setVersion(domain.getVersion());
         if (domain.getReleased() != null) {
             row.setReleased(
-                DateTimeFormatter.ISO_DATE_TIME.format(
-                    domain.getReleased()
-                )
+                DateTimeFormatter.ISO_DATE
+                    .withZone(ZoneId.systemDefault())
+                    .format(domain.getReleased())
             );
         }
         row.setTitle(
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
index 781d5f8d9..78db188a8 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
@@ -49,7 +49,7 @@
                             #{AdminMessages['categorysystems.form.domainKey.label']}
                         </label>
                         <input aria-describedby="domainKey-help"
-                               class="form-control"
+                               class="form-control #{CategorySystemDetailsModel.invalidFields.contains('domainKey') ? 'is-invalid' : ''}"
                                name="domainKey"
                                required="true"
                                type="text" 
@@ -64,7 +64,7 @@
                             #{AdminMessages['categorysystems.form.uri.label']}
                         </label>
                         <input aria-describedby="uri-help"
-                               class="form-control"
+                               class="form-control #{CategorySystemDetailsModel.invalidFields.contains('uri') ? 'is-invalid' : ''}"
                                name="uri"
                                type="text" 
                                value="#{CategorySystemDetailsModel.uri}"
@@ -79,7 +79,7 @@
                             #{AdminMessages['categorysystems.form.version.label']}
                         </label>
                         <input aria-describedby="version-help"
-                               class="form-control"
+                               class="form-control #{CategorySystemDetailsModel.invalidFields.contains('version') ? 'is-invalid' : ''}"
                                name="version"
                                type="text" 
                                value="#{CategorySystemDetailsModel.version}"
@@ -94,7 +94,7 @@
                             #{AdminMessages['categorysystems.form.released.label']}
                         </label>
                         <input aria-describedby="released-help"
-                               class="form-control"
+                               class="form-control #{CategorySystemDetailsModel.invalidFields.contains('released') ? 'is-invalid' : ''}"
                                name="released"
                                type="date" 
                                value="#{CategorySystemDetailsModel.released}"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
index f9dec4e84..6df5addce 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
@@ -1,4 +1,4 @@
-    <!DOCTYPE html>
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -32,7 +32,7 @@
                              width="1em"
                              height="1em"
                              fill="currentColor">
-                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#circle-plus" />
+                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
                         </svg>
                         <span>#{AdminMessages['categorysystems.add']}</span>
                     </a>
@@ -44,20 +44,83 @@
                             <th>#{AdminMessages['categorysystems.table.headers.uri']}</th>
                             <th>#{AdminMessages['categorysystems.table.headers.version']}</th>
                             <th>#{AdminMessages['categorysystems.table.headers.released']}</th>
+                            <th class="text-center" colspan="2">
+                                #{AdminMessages['categorysystems.table.headers.actions']}
+                            </th>
                         </tr>
                     </thead>
                     <tbody>
                         <c:forEach items="#{CategorySystemsTableModel.categorySystems}" 
                                    var="categorySystem">
                             <tr>
-                                <td>
-                                    <a href="#{mvc.uri('CategorySystemsController#getCategorySystemDetails', { 'categorySystemIdentifier': categorySystem.identifier })}">
-                                    #{categorySystem.domainKey}
-                                    </a>
-                                </td>
+                                <td>#{categorySystem.domainKey}</td>
                                 <td>#{categorySystem.uri}</td>
                                 <td>#{categorySystem.version}</td>
                                 <td>#{categorySystem.released}</td>
+                                <td>
+                                    <a class="btn btn-info"
+                                       href="#{mvc.uri('CategorySystemsController#getCategorySystemDetails', { 'categorySystemIdentifier': categorySystem.identifier })}">
+                                        <svg class="bi"
+                                             width="1em"
+                                             height="1em"
+                                             fill="currentColor">
+                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                                        </svg>
+                                        #{AdminMessages['categorysystems.table.actions.edit']}
+                                    </a>
+                                </td>
+                                <td>
+                                    <button class="btn btn-danger"
+                                            data-target="#confirm-delete-#{categorySystem.identifier}"
+                                            data-toggle="modal"
+                                            type="button">
+                                        <svg class="bi"
+                                             width="1em"
+                                             height="1em"
+                                             fill="currentColor">
+                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                        </svg>
+                                        #{AdminMessages['categorysystems.table.actions.delete']}
+                                    </button>
+                                    <div class="modal"
+                                         id="confirm-delete-#{categorySystem.identifier}"
+                                         tabindex="-1">
+                                        <div class="modal-dialog">
+                                            <form action="#{mvc.uri('CategorySystemsController#deleteCategorySystem', {'categorySystemIdentifier': categorySystem.identifier })}"
+                                                  class="modal-content"
+                                                  method="post">
+                                                <div class="modal-header">
+                                                    <h3 class="modal-title">
+                                                        #{AdminMessages['categorysystems.delete.confirm.title']}
+                                                    </h3>
+                                                    <button aria-label="#{AdminMessages['usersgroupsroles.groups.delete.confirm.cancel']}"
+                                                            class="close" 
+                                                            data-dismiss="modal" 
+                                                            type="button">
+                                                        <span aria-hidden="true">&times;</span>
+                                                    </button>
+                                                </div>
+                                                <div class="modal-body">
+                                                    #{AdminMessages.getMessage('categorysystems.delete.confirm.message', [categorySystem.identifier])}
+                                                    <input name="confirmed"
+                                                           type="hidden"
+                                                           value="true" />
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <button class="btn btn-secondary"
+                                                            data-dismiss="modal"
+                                                            type="button">
+                                                        #{AdminMessages['categorysystems.delete.confirm.cancel']}
+                                                    </button>
+                                                    <button class="btn btn-danger" 
+                                                            type="submit">
+                                                        #{AdminMessages['categorysystems.delete.confirm.yes']}
+                                                    </button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                </td>
                             </tr>
                         </c:forEach>
                     </tbody>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
index fe90baa6f..de27f6318 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/groups.xhtml
@@ -67,8 +67,7 @@
                                 <td class="text-center action-col">
                                     <button class="btn btn-danger"
                                             data-toggle="modal"
-                                            data-target="#confirm-delete-#{group.name}"
-                                            href="#">
+                                            data-target="#confirm-delete-#{group.name}">
                                         <svg class="bi"
                                              width="1em"
                                              height="1em"
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index d81275984..059e1b992 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -294,3 +294,10 @@ categorysystems.form.released.label=Released
 categorysystems.details.version=Version
 categorysystems.details.released=Released
 categorysystems.form.errors.uri_invalid=URI is invalid
+categorysystems.table.headers.actions=Actions
+categorysystems.table.actions.delete=Delete
+categorysystems.table.actions.edit=Edit
+categorysystems.delete.confirm.title=Confirm Delete
+categorysystems.delete.confirm.message=Are you sure to delete the category system {0} and all its categories?
+categorysystems.delete.confirm.cancel=Cancel
+categorysystems.delete.confirm.yes=Delete Category System
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 9664bc61e..6816d7078 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -294,3 +294,10 @@ categorysystems.form.released.label=Released
 categorysystems.details.version=Version
 categorysystems.details.released=Freigegeben
 categorysystems.form.errors.uri_invalid=URI ist nicht valide
+categorysystems.table.headers.actions=Aktionen
+categorysystems.table.actions.delete=L\u00f6schen
+categorysystems.table.actions.edit=Bearbeiten
+categorysystems.delete.confirm.title=L\u00f6schen best\u00e4tigen
+categorysystems.delete.confirm.message=Sind Sie sicher, dass Sie das Kategoriensystem {0} mit allen seinen Kategorien l\u00f6schen wollen?
+categorysystems.delete.confirm.cancel=Abbrechen
+categorysystems.delete.confirm.yes=Kategoriensystem l\u00f6schen

From 04d28c1b3fcff64c435827259c8b42ef9a60b4b2 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 14 Nov 2020 22:05:23 +0100
Subject: [PATCH 49/93] Editing of title, description and owners of a category
 system

---
 .../categorization/DomainManager.java         |  35 +
 .../CategorySystemDetailsModel.java           |  90 ++-
 .../categories/CategorySystemOwnerOption.java |  69 ++
 .../categories/CategorySystemsController.java | 100 ++-
 .../categories/categorysystem-details.xhtml   | 662 +++++++++++++++---
 .../org/libreccm/ui/AdminBundle.properties    |  43 ++
 .../org/libreccm/ui/AdminBundle_de.properties |  43 ++
 7 files changed, 912 insertions(+), 130 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerOption.java

diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainManager.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainManager.java
index f34e48779..fe44dd540 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/DomainManager.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainManager.java
@@ -119,6 +119,41 @@ public class DomainManager implements Serializable {
         domainRepo.save(domain);
     }
 
+    /**
+     * Adds a {@code CcmApplication} to the owners of a {@link Domain}.If the
+ provided {@code CcmApplication} is already an owner of the provided
+    {@code Domain} the method does nothing.
+     *
+     * @param application The {@code CcmApplication} to add to the owners of the
+     *                    {@code Domain}.
+     * @param domain      The {@code Domain} to which owners the
+     *                    {@code CcmApplication is added}.
+     * @param context Context for the mapping
+     */
+    @AuthorizationRequired
+    @RequiresPrivilege(CategorizationConstants.PRIVILEGE_MANAGE_DOMAINS)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public void addDomainOwner(
+        final CcmApplication application,
+        final Domain domain,
+        final String context
+    ) {
+        final DomainOwnership ownership = new DomainOwnership();
+        ownership.setUuid(UUID.randomUUID().toString());
+        ownership.setDomain(domain);
+        ownership.setOwner(application);
+        ownership.setContext(context);
+        ownership.setOwnerOrder(domain.getOwners().size() + 1);
+        ownership.setDomainOrder(application.getDomains().size() + 1);
+
+        application.addDomain(ownership);
+        domain.addOwner(ownership);
+
+        entityManager.persist(ownership);
+        applicationRepo.save(application);
+        domainRepo.save(domain);
+    }
+
     /**
      * Removes a {@code CcmApplication} from the owners of a {@code Domain}. If
      * the provided {@code CcmApplication} is not an owner of the provided
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index 5d88c690e..0baf31e0d 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -20,7 +20,12 @@ package org.libreccm.ui.admin.categories;
 
 import org.libreccm.categorization.Domain;
 import org.libreccm.categorization.DomainOwnership;
+import org.libreccm.configuration.ConfigurationManager;
+import org.libreccm.l10n.GlobalizationHelper;
+import org.libreccm.l10n.LocalizedTextsUtil;
 import org.libreccm.ui.Message;
+import org.libreccm.web.ApplicationRepository;
+import org.libreccm.web.CcmApplication;
 
 import java.time.LocalDate;
 import java.time.ZoneOffset;
@@ -29,12 +34,14 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.inject.Named;
 import javax.transaction.Transactional;
 
@@ -46,6 +53,12 @@ import javax.transaction.Transactional;
 @Named("CategorySystemDetailsModel")
 public class CategorySystemDetailsModel {
 
+    @Inject
+    private ApplicationRepository applicationRepository;
+
+    @Inject
+    private GlobalizationHelper globalizationHelper;
+
     private long categorySystemId;
 
     private String uuid;
@@ -60,12 +73,18 @@ public class CategorySystemDetailsModel {
 
     private Map<String, String> title;
 
+    private List<String> unusedTitleLocales;
+
     private Map<String, String> description;
 
+    private List<String> unusedDescriptionLocales;
+
     private List<CategorySystemOwnerRow> owners;
 
+    private List<CategorySystemOwnerOption> ownerOptions;
+
     private final List<Message> messages;
-    
+
     private Set<String> invalidFields;
 
     public CategorySystemDetailsModel() {
@@ -137,14 +156,34 @@ public class CategorySystemDetailsModel {
         return Collections.unmodifiableMap(title);
     }
 
+    public List<String> getUnusedTitleLocales() {
+        return Collections.unmodifiableList(unusedTitleLocales);
+    }
+
+    public boolean hasUnusedTitleLocales() {
+        return !unusedTitleLocales.isEmpty();
+    }
+
     public Map<String, String> getDescription() {
         return Collections.unmodifiableMap(description);
     }
 
+    public List<String> getUnusedDescriptionLocales() {
+        return Collections.unmodifiableList(unusedDescriptionLocales);
+    }
+
+    public boolean hasUnusedDescriptionLocales() {
+        return !unusedDescriptionLocales.isEmpty();
+    }
+
     public List<CategorySystemOwnerRow> getOwners() {
         return Collections.unmodifiableList(owners);
     }
 
+    public List<CategorySystemOwnerOption> getOwnerOptions() {
+        return Collections.unmodifiableList(ownerOptions);
+    }
+
     public boolean isNew() {
         return categorySystemId == 0;
     }
@@ -156,15 +195,15 @@ public class CategorySystemDetailsModel {
     public void addMessage(final Message message) {
         messages.add(message);
     }
-    
+
     public Set<String> getInvalidFields() {
         return Collections.unmodifiableSet(invalidFields);
     }
-    
+
     protected void addInvalidField(final String invalidField) {
         invalidFields.add(invalidField);
     }
-    
+
     protected void setInvalidFields(final Set<String> invalidFields) {
         this.invalidFields = new HashSet<>(invalidFields);
     }
@@ -185,6 +224,8 @@ public class CategorySystemDetailsModel {
                 .withZone(ZoneOffset.systemDefault())
                 .format(domain.getReleased());
         }
+        final List<Locale> availableLocales = globalizationHelper
+            .getAvailableLocales();
         title = domain
             .getTitle()
             .getValues()
@@ -196,6 +237,16 @@ public class CategorySystemDetailsModel {
                     entry -> entry.getValue()
                 )
             );
+        final Set<Locale> titleLocales = domain
+            .getTitle()
+            .getAvailableLocales();
+        unusedTitleLocales = availableLocales
+            .stream()
+            .filter(locale -> !titleLocales.contains(locale))
+            .map(Locale::toString)
+            .sorted()
+            .collect(Collectors.toList());
+
         description = domain
             .getDescription()
             .getValues()
@@ -207,6 +258,15 @@ public class CategorySystemDetailsModel {
                     entry -> entry.getValue()
                 )
             );
+        final Set<Locale> descriptionLocales = domain
+            .getDescription()
+            .getAvailableLocales();
+        unusedDescriptionLocales = availableLocales
+            .stream()
+            .filter(locale -> !descriptionLocales.contains(locale))
+            .map(Locale::toString)
+            .sorted()
+            .collect(Collectors.toList());
 
         owners = domain
             .getOwners()
@@ -214,6 +274,20 @@ public class CategorySystemDetailsModel {
             .map(this::buildOwnerRow)
             .sorted()
             .collect(Collectors.toList());
+
+        final List<CcmApplication> ownerApplications = domain
+            .getOwners()
+            .stream()
+            .map(DomainOwnership::getOwner)
+            .collect(Collectors.toList());
+
+        ownerOptions = applicationRepository
+            .findAll()
+            .stream()
+            .filter(application -> !ownerApplications.contains(application))
+            .map(CategorySystemOwnerOption::new)
+            .sorted()
+            .collect(Collectors.toList());
     }
 
     private CategorySystemOwnerRow buildOwnerRow(
@@ -221,10 +295,14 @@ public class CategorySystemDetailsModel {
     ) {
         final CategorySystemOwnerRow ownerRow = new CategorySystemOwnerRow();
         ownerRow.setOwnershipId(ownership.getOwnershipId());
-        ownerRow.setUuid(ownership.getUuid());
+        ownerRow.setUuid(ownership.getOwner().getUuid());
         ownerRow.setContext(ownership.getContext());
         ownerRow.setOwnerOrder(ownership.getOwnerOrder());
-        ownerRow.setOwnerAppName(ownership.getOwner().getDisplayName());
+        if (ownership.getOwner().getDisplayName() == null) {
+            ownerRow.setOwnerAppName(ownership.getOwner().getApplicationType());
+        } else {
+            ownerRow.setOwnerAppName(ownership.getOwner().getDisplayName());
+        }
 
         return ownerRow;
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerOption.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerOption.java
new file mode 100644
index 000000000..f0947a8f7
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerOption.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import org.libreccm.web.CcmApplication;
+
+import java.util.Objects;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class CategorySystemOwnerOption
+    implements Comparable<CategorySystemOwnerOption> {
+
+    private final long applicationId;
+
+    private final String applicationUuid;
+
+    private final String applicationName;
+
+    public CategorySystemOwnerOption(final CcmApplication application) {
+        applicationId = application.getObjectId();
+        applicationUuid = application.getUuid();
+        if (application.getDisplayName() == null) {
+            applicationName = application.getApplicationType();
+        } else {
+            applicationName = application.getDisplayName();
+        }
+    }
+
+    public long getApplicationId() {
+        return applicationId;
+    }
+
+    public String getApplicationUuid() {
+        return applicationUuid;
+    }
+
+    public String getApplicationName() {
+        return applicationName;
+    }
+
+    @Override
+    public int compareTo(final CategorySystemOwnerOption other) {
+        return Objects.compare(
+            applicationName,
+            Objects.requireNonNull(other).getApplicationName(),
+            String::compareTo
+        );
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
index 88f64eff5..960982742 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
@@ -85,7 +85,6 @@ public class CategorySystemsController {
 //    public String getCategoryManager() {
 //        return getCategorySystems();
 //    }
-
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -291,8 +290,10 @@ public class CategorySystemsController {
             final Locale locale = new Locale(localeParam);
             domain.getTitle().addValue(locale, value);
             domainRepository.save(domain);
-            categorySystemDetailsModel.setCategorySystem(domain);
-            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+            return String.format(
+                "redirect:categorymanager/categorysystems/ID-%d/details",
+                domain.getObjectId()
+            );
         } else {
             categorySystemDetailsModel.addMessage(
                 new Message(
@@ -310,6 +311,7 @@ public class CategorySystemsController {
     @POST
     @Path("/{categorySystemIdentifier}/title/${locale}/edit")
     @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public String editTitle(
         @PathParam("categorySystemIdentifier")
         final String categorySystemIdentifier,
@@ -345,8 +347,10 @@ public class CategorySystemsController {
             final Locale locale = new Locale(localeParam);
             domain.getTitle().addValue(locale, value);
             domainRepository.save(domain);
-            categorySystemDetailsModel.setCategorySystem(domain);
-            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+            return String.format(
+                "redirect:categorymanager/categorysystems/ID-%d/details",
+                domain.getObjectId()
+            );
         } else {
             categorySystemDetailsModel.addMessage(
                 new Message(
@@ -364,11 +368,15 @@ public class CategorySystemsController {
     @POST
     @Path("/{categorySystemIdentifier}/title/${locale}/remove")
     @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public String removeTitle(
         @PathParam("categorySystemIdentifier")
         final String categorySystemIdentifier,
-        @PathParam("locale") final String localeParam
+        @PathParam("locale") final String localeParam,
+        @FormParam("confirmed")
+        final String confirmed
     ) {
+
         final Identifier identifier = identifierParser.parseIdentifier(
             categorySystemIdentifier
         );
@@ -395,11 +403,15 @@ public class CategorySystemsController {
         if (result.isPresent()) {
             final Domain domain = result.get();
 
-            final Locale locale = new Locale(localeParam);
-            domain.getTitle().removeValue(locale);
-            domainRepository.save(domain);
-            categorySystemDetailsModel.setCategorySystem(domain);
-            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+            if (Objects.equals(confirmed, "true")) {
+                final Locale locale = new Locale(localeParam);
+                domain.getTitle().removeValue(locale);
+                domainRepository.save(domain);
+            }
+            return String.format(
+                "redirect:categorymanager/categorysystems/ID-%d/details",
+                domain.getObjectId()
+            );
         } else {
             categorySystemDetailsModel.addMessage(
                 new Message(
@@ -417,6 +429,7 @@ public class CategorySystemsController {
     @POST
     @Path("/{categorySystemIdentifier}/description/add")
     @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public String addDescription(
         @PathParam("categorySystemIdentifier")
         final String categorySystemIdentifier,
@@ -452,8 +465,10 @@ public class CategorySystemsController {
             final Locale locale = new Locale(localeParam);
             domain.getDescription().addValue(locale, value);
             domainRepository.save(domain);
-            categorySystemDetailsModel.setCategorySystem(domain);
-            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+            return String.format(
+                "redirect:categorymanager/categorysystems/ID-%d/details",
+                domain.getObjectId()
+            );
         } else {
             categorySystemDetailsModel.addMessage(
                 new Message(
@@ -470,8 +485,10 @@ public class CategorySystemsController {
 
     @POST
     @Path(
-        "categorysystems/{categorySystemIdentifier}/description/${locale}/edit")
+        "categorysystems/{categorySystemIdentifier}/description/${locale}/edit"
+    )
     @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public String editDescription(
         @PathParam("categorySystemIdentifier")
         final String categorySystemIdentifier,
@@ -507,8 +524,10 @@ public class CategorySystemsController {
             final Locale locale = new Locale(localeParam);
             domain.getDescription().addValue(locale, value);
             domainRepository.save(domain);
-            categorySystemDetailsModel.setCategorySystem(domain);
-            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+            return String.format(
+                "redirect:categorymanager/categorysystems/ID-%d/details",
+                domain.getObjectId()
+            );
         } else {
             categorySystemDetailsModel.addMessage(
                 new Message(
@@ -527,10 +546,13 @@ public class CategorySystemsController {
     @Path(
         "categorysystems/{categorySystemIdentifier}/description/${locale}/remove")
     @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public String removeDescription(
         @PathParam("categorySystemIdentifier")
         final String categorySystemIdentifier,
-        @PathParam("locale") final String localeParam
+        @PathParam("locale") final String localeParam,
+        @FormParam("confirmed")
+        final String confirmed
     ) {
         final Identifier identifier = identifierParser.parseIdentifier(
             categorySystemIdentifier
@@ -558,11 +580,15 @@ public class CategorySystemsController {
         if (result.isPresent()) {
             final Domain domain = result.get();
 
-            final Locale locale = new Locale(localeParam);
-            domain.getDescription().removeValue(locale);
-            domainRepository.save(domain);
-            categorySystemDetailsModel.setCategorySystem(domain);
-            return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
+            if (Objects.equals(confirmed, "true")) {
+                final Locale locale = new Locale(localeParam);
+                domain.getDescription().removeValue(locale);
+                domainRepository.save(domain);
+            }
+            return String.format(
+                "redirect:categorymanager/categorysystems/ID-%d/details",
+                domain.getObjectId()
+            );
         } else {
             categorySystemDetailsModel.addMessage(
                 new Message(
@@ -581,10 +607,12 @@ public class CategorySystemsController {
     @Path("/{categorySystemIdentifier}/owners/add")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String addOwner(
         @PathParam("categorySystemIdentifier")
         final String categorySystemIdentifier,
-        @FormParam("applicationUuid") final String applicationUuid
+        @FormParam("applicationUuid") final String applicationUuid,
+        @FormParam("context") final String context
     ) {
         final Identifier identifier = identifierParser.parseIdentifier(
             categorySystemIdentifier
@@ -628,11 +656,16 @@ public class CategorySystemsController {
             }
 
             final CcmApplication owner = appResult.get();
-
-            domainManager.addDomainOwner(owner, domain);
+            if (context == null
+                    || context.isEmpty()
+                    || context.matches("\\s*")) {
+                domainManager.addDomainOwner(owner, domain);
+            } else {
+                domainManager.addDomainOwner(owner, domain, context);
+            }
 
             return String.format(
-                "redirect:categorymanager/categorysystems/%s",
+                "redirect:categorymanager/categorysystems/ID-%s/details",
                 categorySystemIdentifier
             );
         } else {
@@ -650,13 +683,15 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/{categorySystemIdentifier}/owners/remove")
+    @Path("/{categorySystemIdentifier}/owners/${applicationUuid}/remove")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String removeOwner(
         @PathParam("categorySystemIdentifier")
         final String categorySystemIdentifier,
-        @FormParam("applicationUuid") final String applicationUuid
+        @PathParam("applicationUuid") final String applicationUuid,
+        @FormParam("confirmed") final String confirmed
     ) {
         final Identifier identifier = identifierParser.parseIdentifier(
             categorySystemIdentifier
@@ -699,12 +734,13 @@ public class CategorySystemsController {
                 return "org/libreccm/ui/admin/categories/application-not-found.xhtml";
             }
 
-            final CcmApplication owner = appResult.get();
-
-            domainManager.removeDomainOwner(owner, domain);
+            if (Objects.equals(confirmed, "true")) {
+                final CcmApplication owner = appResult.get();
+                domainManager.removeDomainOwner(owner, domain);
+            }
 
             return String.format(
-                "redirect:categorymanager/categorysystems/%s",
+                "redirect:categorymanager/categorysystems/ID-%s/details",
                 categorySystemIdentifier
             );
         } else {
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index b184986f6..9687a8c00 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -90,20 +90,92 @@
                 <h2>
                     #{AdminMessages['categorysystems.details.title.heading']}
                 </h2>
-                <div class="text-right mb-2">
-                    <a class="btn btn-secondary"
-                       href="#">
-                        <svg class="bi"
-                             width="1em"
-                             height="1em"
-                             fill="currentColor">
-                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#circle-plus" />
-                        </svg>
-                        <span>#{AdminMessages['categorysystems.details.title.add']}</span>
-                    </a>
-                </div>
-                <c:choose>
+                <c:if test="#{CategorySystemDetailsModel.hasUnusedTitleLocales()}">
+                    <div class="mb-2">
+                        <div class="text-right">
+                            <button class="btn btn-secondary"
+                                    data-target="#categorysystem-title-add"
+                                    data-toggle="modal"
+                                    type="button">
+                                <svg class="bi"
+                                     width="1em"
+                                     height="1em"
+                                     fill="currentColor">
+                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
+                                </svg>
+                                <span>#{AdminMessages['categorysystems.details.title.add']}</span>
+                            </button>
+                        </div>
+                        <div class="modal fade"
+                             data-backdrop="static"
+                             id="categorysystem-title-add"
+                             tabindex="-1">
+                            <div class="modal-dialog">
+                                <form action="#{mvc.uri('CategorySystemsController#addTitle', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier })}"
+                                      class="modal-content"
+                                      method="post">
+                                    <div class="modal-header">
+                                        <h3 class="modal-title">
+                                            #{AdminMessages['categorysystems.details.title.add.dialog.title']}
+                                        </h3>
+                                        <button aria-label="#{AdminMessages['categorysystems.details.title.add.dialog.close']}"
+                                                class="close" 
+                                                data-dismiss="modal" 
+                                                type="button">
+                                            <span aria-hidden="true">&times;</span>
+                                        </button>
+                                    </div>
+                                    <div class="modal-body">
+                                        <div class="form-group">
+                                            <label for="categorysystem-title-add-locale">
+                                                #{AdminMessages['categorysystems.details.title.add.dialog.locale.label']}
+                                            </label>
+                                            <select aria-describedby="categorysystem-title-add-locale-help"
+                                                    id="categorysystem-title-add-locale"
+                                                    name="locale"
+                                                    required="true">
+                                                <c:forEach items="#{CategorySystemDetailsModel.unusedTitleLocales}" var="locale">
+                                                    <option value="#{locale}">#{locale}</option>
+                                                </c:forEach>
+                                            </select>
+                                            <small class="form-text text-muted"
+                                                   id="categorysystem-title-add-locale-help">
+                                                #{AdminMessages['categorysystems.details.title.add.dialog.locale.help']}
+                                            </small>
 
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="categorysystem-title-add-value">
+                                                #{AdminMessages['categorysystems.details.title.add.dialog.value.label']}
+                                            </label>
+                                            <input aria-describedby="categorysystem-title-add-value-help"
+                                                   class="form-control"
+                                                   id="categorysystem-title-add-value"
+                                                   name="value"
+                                                   required="true"
+                                                   type="text" />
+                                            <small class="form-text text-muted"
+                                                   id="categorysystem-title-add-locale-help">
+                                                #{AdminMessages['categorysystems.details.title.add.dialog.value.help']}
+                                            </small>
+                                        </div>
+                                    </div>
+                                    <div class="modal-footer">
+                                        <button class="btn btn-secondary" 
+                                                data-dismiss="modal"
+                                                type="button" >
+                                            #{AdminMessages['categorysystems.details.title.add.dialog.close']}
+                                        </button>
+                                        <button type="submit" class="btn btn-primary">
+                                            #{AdminMessages['categorysystems.details.title.add.dialog.submit']}
+                                        </button>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                    </div>
+                </c:if>
+                <c:choose>
                     <c:when test="#{CategorySystemDetailsModel.getTitle().isEmpty()}">
                         <p>
                             #{AdminMessages['categorysystems.details.title.none']}
@@ -131,28 +203,137 @@
                                             #{entry.value}
                                         </td>
                                         <td>
-                                            <button class="btn btn-info"
-                                                    type="button">
-                                                <svg class="bi"
-                                                     width="1em"
-                                                     height="1em"
-                                                     fill="currentColor">
-                                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                                                </svg>
-                                                <span>#{AdminMessages['categorysystems.details.title.table.actions.edit']}</span>
-                                            </button>
+                                            <div class="text-center">
+                                                <button class="btn btn-info"
+                                                        data-target="#categorysystem-title-#{entry.key}-edit"
+                                                        data-toggle="modal"
+                                                        type="button">
+                                                    <svg class="bi"
+                                                         width="1em"
+                                                         height="1em"
+                                                         fill="currentColor">
+                                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                                                    </svg>
+                                                    <span>#{AdminMessages['categorysystems.details.title.table.actions.edit']}</span>
+                                                </button>
+                                            </div>
+                                            <div aria-describedby="categorysystem-title-#{entry.key}-edit-title"
+                                                 aria-hidden="true"
+                                                 class="modal fade"
+                                                 data-backdrop="static"
+                                                 id="categorysystem-title-#{entry.key}-edit"
+                                                 tabindex="-1">
+                                                <div class="modal-dialog">
+                                                    <form action="#{mvc.uri('CategorySystemsController#editTitle', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier, 'locale': entry.key })}"
+                                                          class="modal-content"
+                                                          method="post">
+                                                        <div class="modal-header">
+                                                            <h3 class="modal-title" id="categorysystem-title-#{entry.key}-edit-title">
+                                                                #{AdminMessages['categorysystems.details.title.table.actions.edit.dialog.title']}
+                                                            </h3>
+                                                            <button aria-label="#{AdminMessages['categorysystems.details.title.edit.dialog.close']}"
+                                                                    class="close"
+                                                                    data-dismiss="modal"
+                                                                    type="button">
+                                                                <span aria-hidden="true">&times;</span>
+                                                            </button>
+                                                        </div>
+                                                        <div class="modal-body">
+                                                            <input name="locale"
+                                                                   value="#{entry.key}"
+                                                                   type="hidden" />
+                                                            <div class="form-group">
+                                                                <label for="categorysystem-title-#{entry.key}-edit-value">
+                                                                    #{AdminMessages['categorysystems.details.title.edit.dialog.value.label']}
+                                                                </label>
+                                                                <input aria-describedby="categorysystem-title-#{entry.key}-edit-value-help"
+                                                                       class="form-control"
+                                                                       id="categorysystem-title-#{entry.key}-edit-value"
+                                                                       name="value"
+                                                                       required="true"
+                                                                       type="text" 
+                                                                       value="#{entry.value}" />
+                                                                <small class="form-text text-muted"
+                                                                       id="categorysystem-title-#{entry.key}-edit-value-help">
+                                                                    #{AdminMessages['categorysystems.details.title.edit.dialog.value.help']}
+                                                                </small>
+                                                            </div>
+                                                        </div>
+                                                        <div class="modal-footer">
+                                                            <div class="modal-footer">
+                                                                <button class="btn btn-secondary" 
+                                                                        data-dismiss="modal"
+                                                                        type="button" >
+                                                                    #{AdminMessages['categorysystems.details.title.edit.dialog.close']}
+                                                                </button>
+                                                                <button type="submit" class="btn btn-primary">
+                                                                    #{AdminMessages['categorysystems.details.title.edit.dialog.submit']}
+                                                                </button>
+                                                            </div>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            </div>
                                         </td>
                                         <td>
-                                            <button class="btn btn-danger"
-                                                    type="button">
-                                                <svg class="bi"
-                                                     width="1em"
-                                                     height="1em"
-                                                     fill="currentColor">
-                                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                                </svg>
-                                                <span>#{AdminMessages['categorysystems.details.title.table.actions.remove']}</span>
-                                            </button>
+                                            <div class="text-center">
+                                                <button class="btn btn-danger"
+                                                        data-target="#categorysystem-title-#{entry.key}-remove"
+                                                        data-toggle="modal"
+                                                        type="button">
+                                                    <svg class="bi"
+                                                         width="1em"
+                                                         height="1em"
+                                                         fill="currentColor">
+                                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                                    </svg>
+                                                    <span>#{AdminMessages['categorysystems.details.title.table.actions.remove']}</span>
+                                                </button>
+                                            </div>
+                                            <div aria-describedby="categorysystem-title-#{entry.key}-remove-title"
+                                                 aria-hidden="true"
+                                                 class="modal fade"
+                                                 data-backdrop="static"
+                                                 id="categorysystem-title-#{entry.key}-remove"
+                                                 tabindex="-1">
+                                                <div class="modal-dialog">
+                                                    <form action="#{mvc.uri('CategorySystemsController#removeTitle', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier, 'locale': entry.key })}"
+                                                          class="modal-content"
+                                                          method="post">
+                                                        <div class="modal-header">
+                                                            <h3 class="modal-title" id="categorysystem-title-#{entry.key}-remove-title">
+                                                                #{AdminMessages['categorysystems.details.title.table.actions.remove.dialog.title']}
+                                                            </h3>
+                                                            <button aria-label="#{AdminMessages['categorysystems.details.title.remove.dialog.close']}"
+                                                                    class="close"
+                                                                    data-dismiss="modal"
+                                                                    type="button">
+                                                                <span aria-hidden="true">&times;</span>
+                                                            </button>
+                                                        </div>
+                                                        <div class="modal-body">
+                                                            <p>
+                                                                #{AdminMessages.getMessage('categorysystems.details.title.remove.dialog.message', [entry.key, entry.value])}
+                                                            </p>
+                                                            <input name="confirmed" 
+                                                                   type="hidden" 
+                                                                   value="true" />
+                                                        </div>
+                                                        <div class="modal-footer">
+                                                            <div class="modal-footer">
+                                                                <button class="btn btn-secondary" 
+                                                                        data-dismiss="modal"
+                                                                        type="button" >
+                                                                    #{AdminMessages['categorysystems.details.title.remove.dialog.close']}
+                                                                </button>
+                                                                <button type="submit" class="btn btn-danger">
+                                                                    #{AdminMessages['categorysystems.details.title.remove.dialog.submit']}
+                                                                </button>
+                                                            </div>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            </div>
                                         </td>
                                     </tr>
                                 </c:forEach>
@@ -164,21 +345,92 @@
                 <h2>
                     #{AdminMessages['categorysystems.details.description.heading']}
                 </h2>
-                <div class="text-right mb-2">
-                    <a class="btn btn-secondary"
-                       href="
-                       ">
-                        <svg class="bi"
-                             width="1em"
-                             height="1em"
-                             fill="currentColor">
-                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#circle-plus" />
-                        </svg>
-                        <span>#{AdminMessages['categorysystems.details.description.add']}</span>
-                    </a>
-                </div>
+                <c:if test="#{CategorySystemDetailsModel.hasUnusedDescriptionLocales()}">
+                    <div class="mb-2">
+                        <div class="text-right">
+                            <button class="btn btn-secondary"
+                                    data-target="#categorysystem-description-add"
+                                    data-toggle="modal"
+                                    type="button">
+                                <svg class="bi"
+                                     width="1em"
+                                     height="1em"
+                                     fill="currentColor">
+                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
+                                </svg>
+                                <span>#{AdminMessages['categorysystems.details.description.add']}</span>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="modal fade"
+                         data-backdrop="static"
+                         id="categorysystem-description-add"
+                         tabindex="-1">
+                        <div class="modal-dialog">
+                            <form action="#{mvc.uri('CategorySystemsController#addDescription', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier })}"
+                                  class="modal-content"
+                                  method="post">
+                                <div class="modal-header">
+                                    <h3 class="modal-title">
+                                        #{AdminMessages['categorysystems.details.description.add.dialog.title']}
+                                    </h3>
+                                    <button aria-label="#{AdminMessages['categorysystems.details.title.add.dialog.close']}"
+                                            class="close" 
+                                            data-dismiss="modal" 
+                                            type="button">
+                                        <span aria-hidden="true">&times;</span>
+                                    </button>
+                                </div>
+                                <div class="modal-body">
+                                    <div class="form-group">
+                                        <label for="categorysystem-description-add-locale">
+                                            #{AdminMessages['categorysystems.details.description.add.dialog.locale.label']}
+                                        </label>
+                                        <select aria-describedby="categorysystem-description-add-locale-help"
+                                                id="categorysystem-description-add-locale"
+                                                name="locale"
+                                                required="true">
+                                            <c:forEach items="#{CategorySystemDetailsModel.unusedDescriptionLocales}" var="locale">
+                                                <option value="#{locale}">#{locale}</option>
+                                            </c:forEach>
+                                        </select>
+                                        <small class="form-text text-muted"
+                                               id="categorysystem-description-add-locale-help">
+                                            #{AdminMessages['categorysystems.details.description.add.dialog.locale.help']}
+                                        </small>
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="categorysystem-description-add-value">
+                                            #{AdminMessages['categorysystems.details.description.add.dialog.value.label']}
+                                        </label>
+                                        <textarea aria-describedby="categorysystem-description-add-value-help"
+                                                  class="form-control"
+                                                  cols="80"
+                                                  id="categorysystem-description-add-value"
+                                                  name="value"
+                                                  required="true"
+                                                  rows="10"></textarea>
+                                        <small class="form-text text-muted"
+                                               id="categorysystem-description-add-locale-help">
+                                            #{AdminMessages['categorysystems.details.description.add.dialog.value.help']}
+                                        </small>
+                                    </div>
+                                </div>
+                                <div class="modal-footer">
+                                    <button class="btn btn-secondary" 
+                                            data-dismiss="modal"
+                                            type="button" >
+                                        #{AdminMessages['categorysystems.details.description.add.dialog.close']}
+                                    </button>
+                                    <button type="submit" class="btn btn-primary">
+                                        #{AdminMessages['categorysystems.details.description.add.dialog.submit']}
+                                    </button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </c:if>
                 <c:choose>
-
                     <c:when test="#{CategorySystemDetailsModel.getDescription().isEmpty()}">
                         <p>
                             #{AdminMessages['categorysystems.details.description.none']}
@@ -196,7 +448,7 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                <c:forEach items="#{CategorySystemDetailsModel.title}"
+                                <c:forEach items="#{CategorySystemDetailsModel.description}"
                                            var="entry">
                                     <tr>
                                         <td>
@@ -206,28 +458,137 @@
                                             #{entry.value}
                                         </td>
                                         <td>
-                                            <button class="btn btn-info"
-                                                    type="button">
-                                                <svg class="bi"
-                                                     width="1em"
-                                                     height="1em"
-                                                     fill="currentColor">
-                                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                                                </svg>
-                                                <span>#{AdminMessages['categorysystems.details.description.table.actions.edit']}</span>
-                                            </button>
+                                            <div class="text-center">
+                                                <button class="btn btn-info"
+                                                        data-target="#categorysystem-description-#{entry.key}-edit"
+                                                        data-toggle="modal"
+                                                        type="button">
+                                                    <svg class="bi"
+                                                         width="1em"
+                                                         height="1em"
+                                                         fill="currentColor">
+                                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
+                                                    </svg>
+                                                    <span>#{AdminMessages['categorysystems.details.description.table.actions.edit']}</span>
+                                                </button>
+                                            </div>
+                                            <div aria-describedby="categorysystem-description-#{entry.key}-edit-title"
+                                                 aria-hidden="true"
+                                                 class="modal fade"
+                                                 data-backdrop="static"
+                                                 id="categorysystem-description-#{entry.key}-edit"
+                                                 tabindex="-1">
+                                                <div class="modal-dialog">
+                                                    <form action="#{mvc.uri('CategorySystemsController#editDescription', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier, 'locale': entry.key })}"
+                                                          class="modal-content"
+                                                          method="post">
+                                                        <div class="modal-header">
+                                                            <h3 class="modal-title" 
+                                                                id="categorysystem-description-#{entry.key}-edit-title">
+                                                                #{AdminMessages['categorysystems.details.description.table.actions.edit.dialog.title']}
+                                                            </h3>
+                                                            <button aria-label="#{AdminMessages['categorysystems.details.description.edit.dialog.close']}"
+                                                                    class="close"
+                                                                    data-dismiss="modal"
+                                                                    type="button">
+                                                                <span aria-hidden="true">&times;</span>
+                                                            </button>
+                                                        </div>
+                                                        <div class="modal-body">
+                                                            <input name="locale"
+                                                                   value="#{entry.key}"
+                                                                   type="hidden" />
+                                                            <div class="form-group">
+                                                                <label for="categorysystem-description-#{entry.key}-edit-value">
+                                                                    #{AdminMessages['categorysystems.details.description.edit.dialog.value.label']}
+                                                                </label>
+                                                                <textarea aria-describedby="categorysystem-description-#{entry.key}-edit-value-help"
+                                                                          class="form-control"
+                                                                          cols="80"
+                                                                          id="categorysystem-description-#{entry.key}-edit-value"
+                                                                          name="value"
+                                                                          required="true"
+                                                                          rows="10"
+                                                                          type="text">#{entry.value}</textarea>
+                                                                <small class="form-text text-muted"
+                                                                       id="categorysystem-description-#{entry.key}-edit-value-help">
+                                                                    #{AdminMessages['categorysystems.details.description.edit.dialog.value.help']}
+                                                                </small>
+                                                            </div>
+                                                        </div>
+                                                        <div class="modal-footer">
+                                                            <div class="modal-footer">
+                                                                <button class="btn btn-secondary" 
+                                                                        data-dismiss="modal"
+                                                                        type="button" >
+                                                                    #{AdminMessages['categorysystems.details.description.edit.dialog.close']}
+                                                                </button>
+                                                                <button type="submit" class="btn btn-primary">
+                                                                    #{AdminMessages['categorysystems.details.description.edit.dialog.submit']}
+                                                                </button>
+                                                            </div>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            </div>
                                         </td>
                                         <td>
-                                            <button class="btn btn-danger"
-                                                    type="button">
-                                                <svg class="bi"
-                                                     width="1em"
-                                                     height="1em"
-                                                     fill="currentColor">
-                                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                                </svg>
-                                                <span>#{AdminMessages['categorysystems.details.description.table.actions.remove']}</span>
-                                            </button>
+                                            <div class="text-center">
+                                                <button class="btn btn-danger"
+                                                        data-target="#categorysystem-description-#{entry.key}-remove"
+                                                        data-toggle="modal"
+                                                        type="button">
+                                                    <svg class="bi"
+                                                         width="1em"
+                                                         height="1em"
+                                                         fill="currentColor">
+                                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                                    </svg>
+                                                    <span>#{AdminMessages['categorysystems.details.description.table.actions.remove']}</span>
+                                                </button>
+                                            </div>
+                                            <div aria-describedby="categorysystem-description-#{entry.key}-remove-title"
+                                                 aria-hidden="true"
+                                                 class="modal fade"
+                                                 data-backdrop="static"
+                                                 id="categorysystem-description-#{entry.key}-remove"
+                                                 tabindex="-1">
+                                                <div class="modal-dialog">
+                                                    <form action="#{mvc.uri('CategorySystemsController#removeDescription', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier, 'locale': entry.key })}"
+                                                          class="modal-content"
+                                                          method="post">
+                                                        <div class="modal-header">
+                                                            <h3 class="modal-description" id="categorysystem-description-#{entry.key}-remove-title">
+                                                                #{AdminMessages['categorysystems.details.description.table.actions.remove.dialog.title']}
+                                                            </h3>
+                                                            <button aria-label="#{AdminMessages['categorysystems.details.description.remove.dialog.close']}"
+                                                                    class="close"
+                                                                    data-dismiss="modal"
+                                                                    type="button">
+                                                                <span aria-hidden="true">&times;</span>
+                                                            </button>
+                                                        </div>
+                                                        <div class="modal-body">
+                                                            <p>
+                                                                #{AdminMessages.getMessage('categorysystems.details.description.remove.dialog.message', [entry.key, entry.value])}
+                                                            </p>
+                                                            <input name="confirmed" 
+                                                                   type="hidden" 
+                                                                   value="true" />
+                                                        </div>
+                                                        <div class="modal-footer">
+                                                            <button class="btn btn-secondary" 
+                                                                    data-dismiss="modal"
+                                                                    type="button" >
+                                                                #{AdminMessages['categorysystems.details.description.remove.dialog.close']}
+                                                            </button>
+                                                            <button type="submit" class="btn btn-danger">
+                                                                #{AdminMessages['categorysystems.details.description.remove.dialog.submit']}
+                                                            </button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            </div>
                                         </td>
                                     </tr>
                                 </c:forEach>
@@ -239,18 +600,88 @@
                 <h2>
                     #{AdminMessages['categorysystems.details.owners.heading']}
                 </h2>
-                <div class="text-right mb-2">
-                    <a class="btn btn-secondary"
-                       href="
-                       ">
-                        <svg class="bi"
-                             width="1em"
-                             height="1em"
-                             fill="currentColor">
-                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#circle-plus" />
-                        </svg>
-                        <span>#{AdminMessages['categorysystems.details.owners.add']}</span>
-                    </a>
+                <div class="mb-2">
+                    <div class="text-right">
+                        <button class="btn btn-secondary"
+                                data-target="#categorysystem-owner-add"
+                                data-toggle="modal"
+                                type="button">
+                            <svg class="bi"
+                                 width="1em"
+                                 height="1em"
+                                 fill="currentColor">
+                                <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
+                            </svg>
+                            <span>#{AdminMessages['categorysystems.details.owners.add']}</span>
+                        </button>
+                    </div>
+                    <div class="modal fade"
+                         data-backdrop="static"
+                         id="categorysystem-owner-add"
+                         tabindex="-1">
+                        <div class="modal-dialog">
+                            <form action="#{mvc.uri('CategorySystemsController#addOwner', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier })}"
+                                  class="modal-content"
+                                  method="post">
+                                <div class="modal-header">
+                                    <h3 class="modal-title">
+                                        #{AdminMessages['categorysstems.details.owner.add.dialog.title']}
+                                    </h3>
+                                    <button aria-label="#{AdminMessages['categorysystems.details.owner.add.dialog.close']}"
+                                            class="close"
+                                            data-dismiss="modal"
+                                            type="button">
+                                        <span aria-hidden="true">&times;</span>
+                                    </button>
+                                </div>
+                                <div class="modal-body">
+                                    <div class="form-group">
+                                        <label for="categorysystem-owner-add-application">
+                                            #{AdminMessages['categorysystems.details.owner.add.dialog.application.label']}
+                                        </label>
+                                        <select aria-describedby="categorysystem-owner-add-application-help"
+                                                id="categorysystem-owner-add-appliaction"
+                                                name="applicationUuid"
+                                                required="true"
+                                                size="1">
+                                            <c:forEach items="#{CategorySystemDetailsModel.ownerOptions}" var="application">
+                                                <option value="#{application.applicationUuid}">
+                                                    #{application.applicationName}
+                                                </option>
+                                            </c:forEach>
+                                        </select>
+                                        <small class="form-text text-muted"
+                                               id="categorysystem-owner-add-application-help">
+                                            #{AdminMessages['categorysystems.details.owner.add.dialog.application.help']}
+                                        </small>
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="categorysystem-owner-add-context">
+                                            #{AdminMessages['categorysystems.details.owner.add.dialog.context.label']}
+                                        </label>
+                                        <input aria-describedby="categorysystem-owner-add-context-help"
+                                               id="categorysystem-owner-add-context"
+                                               name="context"
+                                               type="text" />
+                                        <small class="form-text text-muted"
+                                               id="categorysystem-owner-add-context-help">
+                                            #{AdminMessages['categorysystems.details.owner.add.dialog.context.help']}
+                                        </small>
+                                    </div>
+                                    <div class="modal-footer">
+                                        <button class="btn btn-secondary" 
+                                                data-dismiss="modal"
+                                                type="button" >
+                                            #{AdminMessages['categorysystems.details.owner.add.dialog.close']}
+                                        </button>
+                                        <button type="submit" class="btn btn-primary">
+                                            #{AdminMessages['categorysystems.details.owner.add.dialog.submit']}
+                                        </button>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
                 </div>
                 <c:choose>
                     <c:when test="#{CategorySystemDetailsModel.getOwners().isEmpty()}">
@@ -259,7 +690,7 @@
                         </p>
                     </c:when>
                     <c:otherwise>
-                        <table>
+                        <table class="table table-hover">
                             <thead>
                                 <tr>
                                     <th>
@@ -284,16 +715,63 @@
                                             #{owner.context}
                                         </td>
                                         <td>
-                                            <button class="btn btn-danger"
-                                                    type="button">
-                                                <svg class="bi"
-                                                     width="1em"
-                                                     height="1em"
-                                                     fill="currentColor">
-                                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                                </svg>
-                                                <span>#{AdminMessages['categorysystems.details.owners.remove']}</span>
-                                            </button>
+                                            <div class="text-center">
+                                                <button class="btn btn-danger"
+                                                        data-target="#categorysystem-owner-#{owner.uuid}-remove"
+                                                        data-toggle="modal"
+                                                        type="button">
+                                                    <svg class="bi"
+                                                         width="1em"
+                                                         height="1em"
+                                                         fill="currentColor">
+                                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
+                                                    </svg>
+                                                    <span>#{AdminMessages['categorysystems.details.owners.remove']}</span>
+                                                </button>
+                                            </div>
+                                            <div aria-describedby="categorysystem-owner-#{owner.uuid}-remove-title"
+                                                 aria-hidden="true"
+                                                 class="modal fade"
+                                                 data-backdrop="static"
+                                                 id="categorysystem-owner-#{owner.uuid}-remove"
+                                                 tabindex="-1">
+                                                <div class="modal-dialog">
+                                                    <form action="#{mvc.uri('CategorySystemsController#removeOwner', { 'categorySystemIdentifier': CategorySystemDetailsModel.identifier, 'applicationUuid': owner.uuid })}"
+                                                          class="modal-content"
+                                                          method="post">
+                                                        <div class="modal-header">
+                                                            <h3 class="modal-title"
+                                                                id="categorysystem-owner-#{owner.uuid}-remove-title">
+                                                                #{AdminMessages['categorysystems.details.owners.remove.title']}
+                                                            </h3>
+                                                            <button aria-label="#{AdminMessages['categorysystems.details.owners.remove.close']}"
+                                                                    class="close"
+                                                                    data-dismiss="modal"
+                                                                    type="button">
+                                                                <span aria-hidden="true">&times;</span>
+                                                            </button>
+                                                        </div>
+                                                        <div class="modal-body">
+                                                            <p>
+                                                                #{AdminMessages.getMessage('categorysystems.details.owners.remove.message', [owner.ownerAppName])}
+                                                            </p>
+                                                            <input type="hidden"
+                                                                   name="confirmed" 
+                                                                   value="true" />
+                                                        </div>
+                                                        <div class="modal-footer">
+                                                            <button class="btn btn-secondary" 
+                                                                    data-dismiss="modal"
+                                                                    type="button" >
+                                                                #{AdminMessages['categorysystems.details.owners.remove.close']}
+                                                            </button>
+                                                            <button type="submit" class="btn btn-danger">
+                                                                #{AdminMessages['categorysystems.details.owners.remove.submit']}
+                                                            </button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            </div>
                                         </td>
                                     </tr>
                                 </c:forEach>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 059e1b992..1b6a15cbf 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -301,3 +301,46 @@ categorysystems.delete.confirm.title=Confirm Delete
 categorysystems.delete.confirm.message=Are you sure to delete the category system {0} and all its categories?
 categorysystems.delete.confirm.cancel=Cancel
 categorysystems.delete.confirm.yes=Delete Category System
+categorysystems.details.title.add.dialog.title=Add localized title
+categorysystems.details.title.add.dialog.close=Cancel
+categorysystems.details.title.add.dialog.submit=Add title
+categorysystems.details.title.add.dialog.value.label=Localized title
+categorysystems.details.title.add.dialog.value.help=The localized title to add
+categorysystems.details.title.add.dialog.locale.label=Locale
+categorysystems.details.title.add.dialog.locale.help=The locale (language) of the title value to add
+categorysystems.details.title.table.actions.edit.dialog.title=Edit title
+categorysystems.details.title.edit.dialog.close=Cancel
+categorysystems.details.title.edit.dialog.value.label=Localized Title
+categorysystems.details.title.edit.dialog.value.help=The new value for the title
+categorysystems.details.title.edit.dialog.submit=Save
+categorysystems.details.title.table.actions.remove.dialog.title=Remove localized title
+categorysystems.details.title.remove.dialog.close=Cancel
+categorysystems.details.title.remove.dialog.message=Are your sure to delete title "{1}" for locale?
+categorysystems.details.title.remove.dialog.submit=Delete title
+categorysystems.details.description.add.dialog.title=Add localized description
+categorysystems.details.description.add.dialog.locale.label=Locale
+categorysystems.details.description.add.dialog.locale.help=The locale (language) of the description value to add
+categorysystems.details.description.add.dialog.value.label=Localized description
+categorysystems.details.description.add.dialog.value.help=The localized description to add
+categorysystems.details.description.add.dialog.close=Cancel
+categorysystems.details.description.add.dialog.submit=Add description
+categorysystems.details.description.table.actions.edit.dialog.title=Edit description
+categorysystems.details.description.edit.dialog.close=Cancel
+categorysystems.details.description.edit.dialog.value.label=Localized description
+categorysystems.details.description.edit.dialog.value.help=The localized description
+categorysystems.details.description.edit.dialog.submit=Save
+categorysystems.details.description.table.actions.remove.dialog.title=Removed localized description
+categorysystems.details.description.remove.dialog.close=Cancel
+categorysystems.details.description.remove.dialog.message=Are your sure to delete the description for locale {0}?
+categorysystems.details.description.remove.dialog.submit=Remove localized description
+categorysstems.details.owner.add.dialog.title=Add Application Mapping
+categorysystems.details.owner.add.dialog.application.label=Application
+categorysystems.details.owner.add.dialog.application.help=Application for that a new mapping is added
+categorysystems.details.owner.add.dialog.close=Cancel
+categorysystems.details.owner.add.dialog.submit=Add application mapping
+categorysystems.details.owners.remove.title=Remove application mapping
+categorysystems.details.owners.remove.close=Cancel
+categorysystems.details.owners.remove.message=Are your sure to remove the mapping for application {0}?
+categorysystems.details.owners.remove.submit=Remove mapping
+categorysystems.details.owner.add.dialog.context.label=Context
+categorysystems.details.owner.add.dialog.context.help=Context for the mapping
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 6816d7078..65ffc1657 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -301,3 +301,46 @@ categorysystems.delete.confirm.title=L\u00f6schen best\u00e4tigen
 categorysystems.delete.confirm.message=Sind Sie sicher, dass Sie das Kategoriensystem {0} mit allen seinen Kategorien l\u00f6schen wollen?
 categorysystems.delete.confirm.cancel=Abbrechen
 categorysystems.delete.confirm.yes=Kategoriensystem l\u00f6schen
+categorysystems.details.title.add.dialog.title=Lokalisierten Titel hinzuf\u00fcgen
+categorysystems.details.title.add.dialog.close=Abbrechen
+categorysystems.details.title.add.dialog.submit=Titel hinzuf\u00fcgen
+categorysystems.details.title.add.dialog.value.label=Lokalisierter Titel
+categorysystems.details.title.add.dialog.value.help=Der hinzuzuf\u00fcgendende Titel
+categorysystems.details.title.add.dialog.locale.label=Sprache
+categorysystems.details.title.add.dialog.locale.help=Die Sprache des Titels
+categorysystems.details.title.table.actions.edit.dialog.title=Titel bearbeiten
+categorysystems.details.title.edit.dialog.close=Abbrechen
+categorysystems.details.title.edit.dialog.value.label=Lokalisierter Titel
+categorysystems.details.title.edit.dialog.value.help=Neuer Wert f\u00fcr den Titel
+categorysystems.details.title.edit.dialog.submit=Speichern
+categorysystems.details.title.table.actions.remove.dialog.title=Lokalisierten Titel entfernen
+categorysystems.details.title.remove.dialog.close=Abbrechen
+categorysystems.details.title.remove.dialog.message=Sind Sie sicher, dass Sie den Titel "{1}" f\u00fcr die Sprache {0} entfernen wollen?
+categorysystems.details.title.remove.dialog.submit=Titel entfernen
+categorysystems.details.description.add.dialog.title=Lokalisierte Beschreibung hinzuf\u00fcgen
+categorysystems.details.description.add.dialog.locale.label=Sprache
+categorysystems.details.description.add.dialog.locale.help=Die Sprache der Beschreibung
+categorysystems.details.description.add.dialog.value.label=Lokalisierte Beschreibung
+categorysystems.details.description.add.dialog.value.help=Die hinzuzuf\u00fcgende Beschreibung
+categorysystems.details.description.add.dialog.close=Abbrechen
+categorysystems.details.description.add.dialog.submit=Beschreibung hinzuf\u00fcgen
+categorysystems.details.description.table.actions.edit.dialog.title=Beschreibung bearbeiten
+categorysystems.details.description.edit.dialog.close=Abbrechen
+categorysystems.details.description.edit.dialog.value.label=Lokalisierte Beschreibung
+categorysystems.details.description.edit.dialog.value.help=Die lokalisierte Beschreibung
+categorysystems.details.description.edit.dialog.submit=Speichern
+categorysystems.details.description.table.actions.remove.dialog.title=Lokalisierte Beschreibung entfernen
+categorysystems.details.description.remove.dialog.close=Abbrechen
+categorysystems.details.description.remove.dialog.message=Sind Sie sicher das die Beschreibung f\u00fcr die Sprache {0} entfernen wollen?
+categorysystems.details.description.remove.dialog.submit=Lokalisierte Beschreibung entfernen
+categorysstems.details.owner.add.dialog.title=Applikation hinzuf\u00fcgen
+categorysystems.details.owner.add.dialog.application.label=Anwendung
+categorysystems.details.owner.add.dialog.application.help=Hinzuzuf\u00fcgende Anwendung
+categorysystems.details.owner.add.dialog.close=Abbrechen
+categorysystems.details.owner.add.dialog.submit=Anwendung hinzuf\u00fcgen
+categorysystems.details.owners.remove.title=Anwendung entfernen
+categorysystems.details.owners.remove.close=Cancel
+categorysystems.details.owners.remove.message=Sind Sie sicher das die Application {0} entfernen wollen?
+categorysystems.details.owners.remove.submit=Zuordnung entfernen
+categorysystems.details.owner.add.dialog.context.label=Context
+categorysystems.details.owner.add.dialog.context.help=Context for the mapping

From 72fd38bef7b1b1bad4af15ff0a185f332e9a2dd5 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 15 Nov 2020 14:36:02 +0100
Subject: [PATCH 50/93] Composite components for UI

---
 .../categories/CategorySystemsController.java |  30 +-
 .../components/bootstrap/svgIcon.xhtml        |  18 +
 .../libreccm/localizedStringEditor.xhtml      | 504 ++++++++++++++++++
 .../categories/categorysystem-details.xhtml   | 371 +++----------
 .../org/libreccm/ui/AdminBundle.properties    |   4 +-
 .../org/libreccm/ui/AdminBundle_de.properties |   2 +-
 6 files changed, 614 insertions(+), 315 deletions(-)
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/svgIcon.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
index 960982742..866b47262 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
@@ -252,12 +252,11 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/{categorySystemIdentifier}/title/add")
+    @Path("/{identifier}/title/add")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String addTitle(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier,
+        @PathParam("identifier") final String categorySystemIdentifier,
         @FormParam("locale") final String localeParam,
         @FormParam("value") final String value
     ) {
@@ -309,12 +308,11 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/{categorySystemIdentifier}/title/${locale}/edit")
+    @Path("/{identifier}/title/${locale}/edit")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String editTitle(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier,
+        @PathParam("identifier") final String categorySystemIdentifier,
         @PathParam("locale") final String localeParam,
         @FormParam("value") final String value
     ) {
@@ -366,12 +364,11 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/{categorySystemIdentifier}/title/${locale}/remove")
+    @Path("/{identifier}/title/${locale}/remove")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String removeTitle(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier,
+        @PathParam("identifier") final String categorySystemIdentifier,
         @PathParam("locale") final String localeParam,
         @FormParam("confirmed")
         final String confirmed
@@ -427,12 +424,11 @@ public class CategorySystemsController {
     }
 
     @POST
-    @Path("/{categorySystemIdentifier}/description/add")
+    @Path("/{identifier}/description/add")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String addDescription(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier,
+        @PathParam("identifier") final String categorySystemIdentifier,
         @FormParam("locale") final String localeParam,
         @FormParam("value") final String value
     ) {
@@ -485,13 +481,12 @@ public class CategorySystemsController {
 
     @POST
     @Path(
-        "categorysystems/{categorySystemIdentifier}/description/${locale}/edit"
+        "categorysystems/{identifier}/description/${locale}/edit"
     )
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String editDescription(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier,
+        @PathParam("identifier") final String categorySystemIdentifier,
         @PathParam("locale") final String localeParam,
         @FormParam("value") final String value
     ) {
@@ -544,12 +539,11 @@ public class CategorySystemsController {
 
     @POST
     @Path(
-        "categorysystems/{categorySystemIdentifier}/description/${locale}/remove")
+        "categorysystems/{identifier}/description/${locale}/remove")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String removeDescription(
-        @PathParam("categorySystemIdentifier")
-        final String categorySystemIdentifier,
+        @PathParam("identifier") final String categorySystemIdentifier,
         @PathParam("locale") final String localeParam,
         @FormParam("confirmed")
         final String confirmed
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/svgIcon.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/svgIcon.xhtml
new file mode 100644
index 000000000..c8751f49e
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/svgIcon.xhtml
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:xlink="http://www.w3.org/1999/xlink">
+    <cc:interface shortDescription="Component for inserting Bootstrap icons">
+        <cc:attribute name="icon" 
+                      required="true" 
+                      shortDescription="The name of the Icon to insert" />
+    </cc:interface>
+    <cc:implementation>
+        <svg class="bi"
+             width="1em"
+             height="1em"
+             fill="currentColor">
+            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg##{cc.attrs.icon}" />
+        </svg>
+    </cc:implementation>
+</html>
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml
new file mode 100644
index 000000000..c2d96cc5d
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml
@@ -0,0 +1,504 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+    <cc:interface shortDescription="A editor component for localized strings.">
+        <cc:attribute name="addMethod"
+                      required="true"
+                      shortDescription="Name of the endpoiint to which the POST request from the add form is send. The URL must contain a path parameter named identifier. Two values are submitted: locale and value."
+                      type="String" />
+        <cc:attribute name="addButtonLabel" 
+                      default="Add" 
+                      required="false" 
+                      shortDescription="Label for the add button." 
+                      type="String" />
+        <cc:attribute name="addDialogCancelLabel" 
+                      default="Cancel" 
+                      required="false"
+                      shortDescription="Label for the cancel and close buttons." 
+                      type="String" />
+        <cc:attribute name="addDialogLocaleSelectHelp" 
+                      default="The locale of the value of add" 
+                      required="false" 
+                      shortDescription="Help text for the locale select field"
+                      type="String" />
+        <cc:attribute name="addDialogLocaleSelectLabel" 
+                      default="Locale" 
+                      required="false" 
+                      shortDescription="Label for the locale select field"
+                      type="String" />
+        <cc:attribute name="addDialogSubmitLabel"
+                      default="Add"
+                      required="false"
+                      shortDescription="Label for the submit button"
+                      type="String" />
+        <cc:attribute name="addDialogTitle" 
+                      default="Add localization" 
+                      required="false" 
+                      shortDescription="Title for the dialog." 
+                      type="String" />
+        <cc:attribute name="addDialogValueHelp"
+                      required="false"
+                      shortDescription="The value to add"
+                      type="String" />
+        <cc:attribute name="addDialogValueLabel"
+                      required="false"
+                      shortDescription="Value"
+                      type="String" />
+        <cc:attribute name="editButtonLabel" 
+                      default="Edit" 
+                      required="false" 
+                      shortDescription="Label for the edit button" 
+                      type="String" />
+        <cc:attribute name="editDialogCancelLabel"
+                      required="false"
+                      shortDescription="Label for the cancel and close button of the edit dialog"
+                      type="String" />
+        <cc:attribute name="editDialogSubmitLabel"
+                      required="false"
+                      shortDescription="Label for the submit button of the edit dialog"
+                      type="String" />
+        <cc:attribute name="editDialogValueHelp"
+                      default="Value to update"
+                      required="false"
+                      shortDescription="Help text for the value field"
+                      type="String" />
+        <cc:attribute name="editDialogValueLabel"
+                      default="Value"
+                      required="false"
+                      shortDescription="Label for the value field"
+                      type="String" />
+        <cc:attribute name="editDialogTitle"
+                      default="Edit localized value"
+                      required="false"
+                      shortDescription="Title for the edit dialog"
+                      type="String" />
+        <cc:attribute name="editMethod"
+                      required="true"
+                      shortDescription="Name of the endpoiint to which the POST request from the edit form is send. The URL must contain a path parameter named identifier, and a path parameter named locale. The new value is submitted as form parameter with the name value."
+                      type="String" />
+        <cc:attribute name="hasUnusedLocales" 
+                      required="true" 
+                      shortDescription="Are there unused locales? This will usually be an expression pointing to some method. The result must resolve to boolean." 
+                      type="boolean" />
+        <cc:attribute name="headingLevel" 
+                      default="2" 
+                      required="false" 
+                      shortDescription="Level of the heading used for the component. Also determines the heading levels used for other parts of the component." 
+                      type="int" />
+        <cc:attribute name="editorId" 
+                      required="true" 
+                      shortDescription="ID for the editor. Also used as prefix to generate IDs for some subcomponents" 
+                      type="String" />
+        <cc:attribute name="emptyText"
+                      default="No localized values"
+                      required="false"
+                      shortDescription="Text shown if the localized has no values yet."
+                      type="String" />
+        <cc:attribute name="objectIdentifier"
+                      required="true"
+                      shortDescription="Identifier of the object to which the localized string belongs"
+                      type="String" />
+        <cc:attribute name="removeButtonLabel" 
+                      default="Edit" 
+                      required="false" 
+                      shortDescription="Label for the remove button" 
+                      type="String" />
+        <cc:attribute name="removeDialogCancelLabel" 
+                      default="Cancel" 
+                      required="false" 
+                      shortDescription="Label for the cancel and close buttons of the remove dialog" 
+                      type="String" />
+        <cc:attribute name="removeDialogSubmitLabel" 
+                      default="Remove localized value" 
+                      required="false" 
+                      shortDescription="Label for the submit button of the remove dialog (removes the localized value)" 
+                      type="String" />
+        <cc:attribute name="removeDialogText" 
+                      default="Are you sure to remove the following localized value?" 
+                      required="false" 
+                      shortDescription="Text for the remove dialog" 
+                      type="String" />
+        <cc:attribute name="removeDialogTitle" 
+                      default="Remove localized value" 
+                      required="false" 
+                      shortDescription="The title of the remove dialog" 
+                      type="String" />
+        <cc:attribute name="removeMethod"
+                      required="true"
+                      shortDescription="Name of the endpoint to which the POST request from the remove form is send. The URL must contain a path parameter named identifier, and a path parameter named locale."
+                      type="String" />
+        <cc:attribute name="tableActionsHeading"
+                      default="Actions"
+                      required="false"
+                      shortDescription="Heading for the action columns"
+                      type="String" />
+        <cc:attribute name="tableLocaleHeading"
+                      default="Locale"
+                      required="false"
+                      shortDescription="Heading for the locale column"
+                      type="String" />
+        <cc:attribute name="tableValueHeading"
+                      default="Value"
+                      required="false"
+                      shortDescription="Heading for the value column"
+                      type="String" />
+        <cc:attribute name="title" 
+                      required="true" 
+                      shortDescription="Title/Heading of the editor widget" 
+                      type="String" />
+        <cc:attribute name="unusedLocales"
+                      required="true"
+                      shortDescription="A collection of the unused locales of the edited localized string"
+                      type="java.util.Collection" />
+        <cc:attribute name="useTextarea"
+                      default="false"
+                      required="false"
+                      shortDescription="Use a textarea for the value field?"
+                      type="boolean" />
+        <cc:attribute name="values"
+                      required="true"
+                      shortDescription="The localized values"
+                      type="java.util.Map" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="libreccm-localized-string-editor" 
+             id="#{cc.attrs.editorId}">
+            <c:choose>
+                <c:when test="#{cc.attrs.headingLevel == 1}">
+                    <h1>#{cc.attrs.title}</h1>
+                </c:when>
+                <c:when test="#{cc.attrs.headingLevel == 2}">
+                    <h2>#{cc.attrs.title}</h2>
+                </c:when>
+                <c:when test="#{cc.attrs.headingLevel == 3}">
+                    <h3>#{cc.attrs.title}</h3>
+                </c:when>
+                <c:when test="#{cc.attrs.headingLevel == 4}">
+                    <h4>#{cc.attrs.title}</h4>
+                </c:when>
+                <c:when test="#{cc.attrs.headingLevel == 5}">
+                    <h5>#{cc.attrs.title}</h5>
+                </c:when>
+                <c:when test="#{cc.attrs.headingLevel == 6}">
+                    <h6>#{cc.attrs.title}</h6>
+                </c:when>
+                <c:otherwise>
+                    <div>#{cc.attrs.title}</div>
+                </c:otherwise>
+            </c:choose>
+            <c:if test="#{cc.attrs.hasUnusedLocales}">
+                <div class="mb-2">
+                    <div class="text-right">
+                        <button class="btn btn-secondary"
+                                data-target="##{cc.attrs.editorId}-dialog"
+                                data-toggle="modal"
+                                type="button">
+                            <bootstrap:svgIcon icon="plus-circle" />
+                            <span>
+                                #{cc.attrs.addButtonLabel}
+                            </span>
+                        </button>
+                    </div>
+                    <div aria-labelledby="#{cc.attrs.editorId}-dialog-title"
+                         aria-hidden="true" 
+                         class="modal fade"
+                         id="#{cc.attrs.editorId}-dialog"
+                         tabindex="-1">
+                        <div class="modal-dialog">
+                            <form action="#{mvc.uri(cc.attrs.addMethod, { 'identifier': cc.attrs.objectIdentifier})}"
+                                  class="modal-content"
+                                  method="post">
+                                <div class="modal-header">
+                                    <c:choose>
+                                        <c:when test="#{cc.attrs.headingLevel == 1}">
+                                            <h2>#{cc.attrs.addDialogTitle}</h2>
+                                        </c:when>
+                                        <c:when test="#{cc.attrs.headingLevel == 2}">
+                                            <h3>#{cc.attrs.addDialogTitle}</h3>
+                                        </c:when>
+                                        <c:when test="#{cc.attrs.headingLevel == 3}">
+                                            <h4>#{cc.attrs.addDialogTitle}</h4>
+                                        </c:when>
+                                        <c:when test="#{cc.attrs.headingLevel == 4}">
+                                            <h5>#{cc.attrs.addDialogTitle}</h5>
+                                        </c:when>
+                                        <c:when test="#{cc.attrs.headingLevel == 5}">
+                                            <h6>#{cc.attrs.addDialogTitle}</h6>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <div>#{cc.attrs.addDialogTitle}</div>
+                                        </c:otherwise>
+                                    </c:choose>
+                                    <button aria-label="#{cc.attrs.addDialogCancelLabel}"
+                                            class="close" 
+                                            data-dismiss="modal" 
+                                            type="button"   >
+                                        <span aria-hidden="true">&times;</span>
+                                    </button>
+                                </div>
+                                <div class="modal-body">
+                                    <div class="form-group">
+                                        <label for="#{cc.attrs.editorId}-form-locale-select">
+                                            #{cc.attrs.addDialogLocaleSelectLabel}
+                                        </label>
+                                        <select aria-describedby="#{cc.attrs.editorId}-form-locale-select-help"
+                                                id="#{cc.attrs.editorId}-form-locale-select"
+                                                name="locale"
+                                                required="true">
+                                            <c:forEach items="#{cc.attrs.unusedLocales}" 
+                                                       var="locale">
+                                                <option value="#{locale}">#{locale}</option>
+                                            </c:forEach>
+                                        </select>
+                                        <small class="form-text text-muted"
+                                               id="#{cc.attrs.editorId}-form-locale-select-help">
+                                            #{cc.attrs.addDialogLocaleSelectHelp}
+                                        </small>
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="#{cc.attrs.editorId}-form-value">
+                                            #{cc.attrs.addDialogValueLabel}
+                                        </label>
+                                        <c:choose>
+                                            <c:when test="#{cc.attrs.useTextarea}">
+                                                <textarea aria-describedby="#{cc.attrs.editorId}-form-value-help"
+                                                          class="form-control"
+                                                          cols="80"
+                                                          id="#{cc.attrs.editorId}-form-value"
+                                                          name="value"
+                                                          required="true"
+                                                          rows="10"></textarea>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <input aria-describedby="#{cc.attrs.editorId}-form-value-help"
+                                                       class="form-control"
+                                                       id="#{cc.attrs.editorId}-form-value"
+                                                       name="value"
+                                                       required="true"
+                                                       type="text" />
+                                            </c:otherwise>
+                                        </c:choose>
+                                        <small class="form-text text-muted"
+                                               id="#{cc.attrs.editorId}-form-value-help">
+                                            #{cc.attrs.addDialogValueHelp}
+                                        </small>
+                                    </div>
+                                </div>
+                                <div class="modal-footer">
+                                    <button class="btn btn-secondary" 
+                                            data-dismiss="modal"
+                                            type="button" >
+                                        #{cc.attrs.addDialogCancelLabel}
+                                    </button>
+                                    <button type="submit" class="btn btn-primary">
+                                        #{cc.attrs.addDialogSubmitLabel}
+                                    </button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </c:if>
+            <c:choose>
+                <c:when test="#{cc.attrs.values.isEmpty()}">
+                    <p>
+                        #{cc.attrs.emptyText}
+                    </p>
+                </c:when>
+                <c:otherwise>
+                    <table class="table table-hover">
+                        <thead class="thead-light">
+                            <tr>
+                                <th scope="col">#{cc.attrs.tableLocaleHeading}</th>
+                                <th scope="col">#{cc.attrs.tableValueHeading}</th>
+                                <th class="text-center" 
+                                    colspan="2"
+                                    scope="col">#{cc.attrs.tableActionsHeading}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <c:forEach items="#{cc.attrs.values}" var="entry">
+                                <tr>
+                                    <td>#{entry.key}</td>
+                                    <td>#{entry.value}</td>
+                                    <td>
+                                        <div class="text-center">
+                                            <button class="btn btn-info"
+                                                    data-target="##{cc.attrs.editorId}-#{entry.key}-edit-dialog"
+                                                    data-toggle="modal"
+                                                    type="button">
+                                                <bootstrap:svgIcon icon="pen" />
+                                                <span>#{cc.attrs.editButtonLabel}</span>
+                                            </button>
+                                        </div>
+                                        <div aria-labelledby="#{cc.attrs.editorId}-#{entry.key}-edit-dialog-title"
+                                             aria-hidden="true"
+                                             class="modal fade"
+                                             data-backdrop="static"
+                                             id="#{cc.attrs.editorId}-#{entry.key}-edit-dialog"
+                                             tabindex="-1">
+                                            <div class="modal-dialog">
+                                                <form action="#{mvc.uri(cc.attrs.addMethod, { 'identifier': cc.attrs.objectIdentifier, 'locale': entry.key })}"
+                                                      class="modal-content"
+                                                      method="post">
+                                                    <div class="modal-header">
+                                                        <c:choose>
+                                                            <c:when test="#{cc.attrs.headingLevel == 1}">
+                                                                <h2>#{cc.attrs.editDialogTitle}</h2>
+                                                            </c:when>
+                                                            <c:when test="#{cc.attrs.headingLevel == 2}">
+                                                                <h3>#{cc.attrs.editDialogTitle}</h3>
+                                                            </c:when>
+                                                            <c:when test="#{cc.attrs.headingLevel == 3}">
+                                                                <h4>#{cc.attrs.editDialogTitle}</h4>
+                                                            </c:when>
+                                                            <c:when test="#{cc.attrs.headingLevel == 4}">
+                                                                <h5>#{cc.attrs.editDialogTitle}</h5>
+                                                            </c:when>
+                                                            <c:when test="#{cc.attrs.headingLevel == 5}">
+                                                                <h6>#{cc.attrs.editDialogTitle}</h6>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <div>#{cc.attrs.editDialogTitle}</div>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                        <button aria-label="#{cc.attrs.editDialogCancelLabel}"
+                                                                class="close" 
+                                                                data-dismiss="modal" 
+                                                                type="button"   >
+                                                            <span aria-hidden="true">&times;</span>
+                                                        </button>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <input name="locale"
+                                                               value="#{entry.key}"
+                                                               type="hidden" />
+                                                        <div class="form-group">
+                                                            <label for="#{cc.attrs.editorId}-#{entry.key}-edit-dialog-value}">
+                                                                #{cc.attrs.editDialogValueLabel}
+                                                            </label>
+                                                            <c:choose>
+                                                                <c:when test="#{cc.attrs.useTextarea}">
+                                                                    <textarea aria-describedby="#{cc.attrs.editorId}-#{entry.key}-edit-dialog-value-help"
+                                                                              class="form-control"
+                                                                              cols="80"
+                                                                              id="#{cc.attrs.editorId}-#{entry.key}-edit-dialog-value"
+                                                                              name="value"
+                                                                              required="true"
+                                                                              rows="10">#{entry.value}</textarea>
+                                                                </c:when>
+                                                                <c:otherwise>
+                                                                    <input aria-describedby="#{cc.attrs.editorId}-#{entry.key}-edit-dialog-value-help"
+                                                                           class="form-control"
+                                                                           id="#{cc.attrs.editorId}-#{entry.key}-edit-dialog-value"
+                                                                           name="value"
+                                                                           required="true"
+                                                                           type="text" 
+                                                                           value="#{entry.value}" />
+                                                                </c:otherwise>
+                                                            </c:choose>
+                                                            <small class="form-text text-muted"
+                                                                   id="#{cc.attrs.editorId}-#{entry.key}-edit-dialog-value-help">
+                                                                #{cc.attrs.addDialogValueHelp}
+                                                            </small>
+                                                        </div>
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <div class="modal-footer">
+                                                            <button class="btn btn-secondary" 
+                                                                    data-dismiss="modal"
+                                                                    type="button" >
+                                                                #{cc.attrs.editDialogCancelLabel}
+                                                            </button>
+                                                            <button type="submit" class="btn btn-primary">
+                                                                #{cc.attrs.editDialogSubmitLabel}
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <div class="text-center">
+                                            <button class="btn btn-danger"
+                                                    data-target="##{cc.attrs.editorId}-#{entry.key}-remove-dialog"
+                                                    data-toggle="modal"
+                                                    type="button">
+                                                <bootstrap:svgIcon icon="x-circle" />
+                                                <span>#{cc.attrs.removeButtonLabel}</span>
+                                            </button>
+                                        </div>
+                                        <div aria-describedby="#{cc.attrs.editorId}-#{entry.key}-remove-dialog-title"
+                                             aria-hidden="true"
+                                             class="modal fade"
+                                             data-backdrop="static"
+                                             id="#{cc.attrs.editorId}-#{entry.key}-remove-dialog"
+                                             tabindex="-1">
+                                            <div class="modal-dialog">
+                                                <form action="#{mvc.uri(cc.attrs.removeMethod, {'identifier': cc.attrs.objectIdentifier, 'locale': entry.key})}"
+                                                      class="modal-content"
+                                                      method="post">
+                                                    <div class="modal-header">
+                                                        <c:choose>
+                                                            <c:when test="#{cc.attrs.headingLevel == 1}">
+                                                                <h2>#{cc.attrs.removeDialogTitle}</h2>
+                                                            </c:when>
+                                                            <c:when test="#{cc.attrs.headingLevel == 2}">
+                                                                <h3>#{cc.attrs.removeDialogTitle}</h3>
+                                                            </c:when>
+                                                            <c:when test="#{cc.attrs.headingLevel == 3}">
+                                                                <h4>#{cc.attrs.removeDialogTitle}</h4>
+                                                            </c:when>
+                                                            <c:when test="#{cc.attrs.headingLevel == 4}">
+                                                                <h5>#{cc.attrs.removeDialogTitle}</h5>
+                                                            </c:when>
+                                                            <c:when test="#{cc.attrs.headingLevel == 5}">
+                                                                <h6>#{cc.attrs.removeDialogTitle}</h6>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <div>#{cc.attrs.removeDialogTitle}</div>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                        <button aria-label="#{cc.attrs.removeDialogCancelLabel}"
+                                                                class="close" 
+                                                                data-dismiss="modal" 
+                                                                type="button"   >
+                                                            <span aria-hidden="true">&times;</span>
+                                                        </button>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <p>
+                                                            #{cc.attrs.removeDialogText}
+                                                        </p>
+                                                        <pre>#{entry.key}: #{entry.value}</pre>
+                                                        <input name="confirmed"
+                                                               type="hidden"
+                                                               value="true" />
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button class="btn btn-secondary" 
+                                                                data-dismiss="modal"
+                                                                type="button" >
+                                                            #{cc.attrs.removeDialogCancelLabel}
+                                                        </button>
+                                                        <button type="submit" class="btn btn-danger">
+                                                            #{cc.attrs.removeDialogSubmitLabel}
+                                                        </button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            </c:forEach>
+                        </tbody>
+                    </table>
+                </c:otherwise>
+            </c:choose>
+        </div>
+    </cc:implementation>
+</html>
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index 9687a8c00..1597d3401 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -1,9 +1,10 @@
 <!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <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">
+      xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
         <ui:param name="activePage" value="categories" />
@@ -77,272 +78,79 @@
                 <div class="mb-4">
                     <a class="btn btn-primary"
                        href="#{mvc.uri('CategorySystemsController#editCategorySystem', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier } )}">
-                        <svg class="bi"
-                             width="1em"
-                             height="1em"
-                             fill="currentColor">
-                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                        </svg>
+                        <bootstrap:svgIcon icon="pen" />
                         <span>#{AdminMessages['categorysystems.details.edit']}</span>
                     </a>
                 </div>
 
-                <h2>
-                    #{AdminMessages['categorysystems.details.title.heading']}
-                </h2>
-                <c:if test="#{CategorySystemDetailsModel.hasUnusedTitleLocales()}">
-                    <div class="mb-2">
-                        <div class="text-right">
-                            <button class="btn btn-secondary"
-                                    data-target="#categorysystem-title-add"
-                                    data-toggle="modal"
-                                    type="button">
-                                <svg class="bi"
-                                     width="1em"
-                                     height="1em"
-                                     fill="currentColor">
-                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
-                                </svg>
-                                <span>#{AdminMessages['categorysystems.details.title.add']}</span>
-                            </button>
-                        </div>
-                        <div class="modal fade"
-                             data-backdrop="static"
-                             id="categorysystem-title-add"
-                             tabindex="-1">
-                            <div class="modal-dialog">
-                                <form action="#{mvc.uri('CategorySystemsController#addTitle', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier })}"
-                                      class="modal-content"
-                                      method="post">
-                                    <div class="modal-header">
-                                        <h3 class="modal-title">
-                                            #{AdminMessages['categorysystems.details.title.add.dialog.title']}
-                                        </h3>
-                                        <button aria-label="#{AdminMessages['categorysystems.details.title.add.dialog.close']}"
-                                                class="close" 
-                                                data-dismiss="modal" 
-                                                type="button">
-                                            <span aria-hidden="true">&times;</span>
-                                        </button>
-                                    </div>
-                                    <div class="modal-body">
-                                        <div class="form-group">
-                                            <label for="categorysystem-title-add-locale">
-                                                #{AdminMessages['categorysystems.details.title.add.dialog.locale.label']}
-                                            </label>
-                                            <select aria-describedby="categorysystem-title-add-locale-help"
-                                                    id="categorysystem-title-add-locale"
-                                                    name="locale"
-                                                    required="true">
-                                                <c:forEach items="#{CategorySystemDetailsModel.unusedTitleLocales}" var="locale">
-                                                    <option value="#{locale}">#{locale}</option>
-                                                </c:forEach>
-                                            </select>
-                                            <small class="form-text text-muted"
-                                                   id="categorysystem-title-add-locale-help">
-                                                #{AdminMessages['categorysystems.details.title.add.dialog.locale.help']}
-                                            </small>
+                <libreccm:localizedStringEditor addMethod="CategorySystemsController#addTitle"
+                                                addButtonLabel="#{AdminMessages['categorysystems.details.title.add']}"
+                                                addDialogCancelLabel="#{AdminMessages['categorysystems.details.title.add.dialog.close']}"
+                                                addDialogLocaleSelectHelp="#{AdminMessages['categorysystems.details.title.add.dialog.locale.help']}"
+                                                addDialogLocaleSelectLabel="#{AdminMessages['categorysystems.details.title.add.dialog.locale.label']}"
+                                                addDialogSubmitLabel="#{AdminMessages['categorysystems.details.title.add.dialog.submit']}"
+                                                addDialogTitle="#{AdminMessages['categorysystems.details.title.add.dialog.title']}"
+                                                addDialogValueHelp="#{AdminMessages['categorysystems.details.title.add.dialog.value.help']}"
+                                                addDialogValueLabel="#{AdminMessages['categorysystems.details.title.add.dialog.value.label']}"
+                                                editButtonLabel="#{AdminMessages['categorysystems.details.title.table.actions.edit']}"
+                                                editDialogCancelLabel="#{AdminMessages['categorysystems.details.title.edit.dialog.close']}"
+                                                editDialogSubmitLabel="#{AdminMessages['categorysystems.details.title.edit.dialog.submit']}"
+                                                editDialogTitle="#{AdminMessages['categorysystems.details.title.table.actions.edit.dialog.title']}"
+                                                editDialogValueHelp="#{AdminMessages['categorysystems.details.title.edit.dialog.value.help']}"
+                                                editDialogValueLabel="#{AdminMessages['categorysystems.details.title.edit.dialog.value.label']}"
+                                                editMethod="CategorySystemsController#editTitle"
+                                                editorId="categorysystem-title"
+                                                emptyText="#{AdminMessages['categorysystems.details.title.none']}"
+                                                hasUnusedLocales="#{CategorySystemDetailsModel.hasUnusedTitleLocales()}"
+                                                objectIdentifier="#{CategorySystemDetailsModel.identifier}"
+                                                removeButtonLabel="#{AdminMessages['categorysystems.details.title.table.actions.remove']}"
+                                                removeDialogCancelLabel="#{AdminMessages['categorysystems.details.title.remove.dialog.close']}"
+                                                removeDialogSubmitLabel="#{AdminMessages['categorysystems.details.title.remove.dialog.submit']}"
+                                                removeDialogText="#{AdminMessages['categorysystems.details.title.remove.dialog.message']}"
+                                                removeDialogTitle="#{AdminMessages['categorysystems.details.title.table.actions.remove.dialog.title']}"
+                                                removeMethod="CategorySystemsController#removeTitle"
+                                                tableActionsHeading="#{AdminMessages['categorysystems.details.title.table.headings.actions']}"
+                                                tableLocaleHeading="#{AdminMessages['categorysystems.details.title.table.headings.locale']}"
+                                                tableValueHeading="#{AdminMessages['categorysystems.details.title.table.headings.value']}"
+                                                title="#{AdminMessages['categorysystems.details.title.heading']}"
+                                                unusedLocales="#{CategorySystemDetailsModel.unusedTitleLocales}"
+                                                values="#{CategorySystemDetailsModel.title}" />
+                
+                <libreccm:localizedStringEditor addMethod="CategorySystemsController#addDescription"
+                                                addButtonLabel="#{AdminMessages['categorysystems.details.description.add']}"
+                                                addDialogCancelLabel="#{AdminMessages['categorysystems.details.description.add.dialog.close']}"
+                                                addDialogLocaleSelectHelp="#{AdminMessages['categorysystems.details.description.add.dialog.locale.help']}"
+                                                addDialogLocaleSelectLabel=" #{AdminMessages['categorysystems.details.description.add.dialog.locale.label']}"
+                                                addDialogSubmitLabel="#{AdminMessages['categorysystems.details.description.add.dialog.submit']}"
+                                                addDialogTitle="#{AdminMessages['categorysystems.details.description.add.dialog.title']}"
+                                                addDialogValueHelp="#{AdminMessages['categorysystems.details.description.add.dialog.value.help']}"
+                                                addDialogValueLabel="#{AdminMessages['categorysystems.details.description.add.dialog.value.label']}"
+                                                editButtonLabel="#{AdminMessages['categorysystems.details.description.table.actions.edit']}"
+                                                editDialogCancelLabel="#{AdminMessages['categorysystems.details.description.edit.dialog.close']}"
+                                                editDialogSubmitLabel="#{AdminMessages['categorysystems.details.description.edit.dialog.submit']}"
+                                                editDialogTitle="#{AdminMessages['categorysystems.details.description.table.actions.edit.dialog.title']}"
+                                                editDialogValueHelp="#{AdminMessages['categorysystems.details.description.edit.dialog.value.help']}"
+                                                editDialogValueLabel="#{AdminMessages['categorysystems.details.description.edit.dialog.value.label']}"
+                                                editMethod="CategorySystemsController#editDescription"
+                                                editorId="categorysystem-description"
+                                                emptyText="#{AdminMessages['categorysystems.details.description.none']}"
+                                                hasUnusedLocales="#{CategorySystemDetailsModel.hasUnusedDescriptionLocales()}"
+                                                objectIdentifier="#{CategorySystemDetailsModel.identifier}"
+                                                removeButtonLabel="#{AdminMessages['categorysystems.details.description.table.actions.remove']}"
+                                                removeDialogCancelLabel="#{AdminMessages['categorysystems.details.description.remove.dialog.close']}"
+                                                removeDialogSubmitLabel="#{AdminMessages['categorysystems.details.description.remove.dialog.submit']}"
+                                                removeDialogText="#{AdminMessages['categorysystems.details.description.remove.dialog.message']}"
+                                                removeDialogTitle="#{AdminMessages['categorysystems.details.description.table.actions.remove.dialog.title']}"
+                                                removeMethod="CategorySystemsController#removeDescription"
+                                                tableActionsHeading="#{AdminMessages['categorysystems.details.description.table.headings.actions']}"
+                                                tableLocaleHeading="#{AdminMessages['categorysystems.details.description.table.headings.locale']}"
+                                                tableValueHeading="#{AdminMessages['categorysystems.details.description.table.headings.value']}"
+                                                title="#{AdminMessages['categorysystems.details.description.heading']}"
+                                                unusedLocales="#{CategorySystemDetailsModel.unusedTitleLocales}"
+                                                useTextarea="true"
+                                                values="#{CategorySystemDetailsModel.description}" />
 
-                                        </div>
-                                        <div class="form-group">
-                                            <label for="categorysystem-title-add-value">
-                                                #{AdminMessages['categorysystems.details.title.add.dialog.value.label']}
-                                            </label>
-                                            <input aria-describedby="categorysystem-title-add-value-help"
-                                                   class="form-control"
-                                                   id="categorysystem-title-add-value"
-                                                   name="value"
-                                                   required="true"
-                                                   type="text" />
-                                            <small class="form-text text-muted"
-                                                   id="categorysystem-title-add-locale-help">
-                                                #{AdminMessages['categorysystems.details.title.add.dialog.value.help']}
-                                            </small>
-                                        </div>
-                                    </div>
-                                    <div class="modal-footer">
-                                        <button class="btn btn-secondary" 
-                                                data-dismiss="modal"
-                                                type="button" >
-                                            #{AdminMessages['categorysystems.details.title.add.dialog.close']}
-                                        </button>
-                                        <button type="submit" class="btn btn-primary">
-                                            #{AdminMessages['categorysystems.details.title.add.dialog.submit']}
-                                        </button>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-                    </div>
-                </c:if>
-                <c:choose>
-                    <c:when test="#{CategorySystemDetailsModel.getTitle().isEmpty()}">
-                        <p>
-                            #{AdminMessages['categorysystems.details.title.none']}
-                        </p>
-                    </c:when>
-                    <c:otherwise>
-                        <table class="table table-hover">
-                            <thead class="thead-light">
-                                <tr>
-                                    <th scope="col">#{AdminMessages['categorysystems.details.title.table.headings.locale']}</th>
-                                    <th scope="col">#{AdminMessages['categorysystems.details.title.table.headings.value']}</th>
-                                    <th class="text-center" 
-                                        colspan="2" 
-                                        scope="col">#{AdminMessages['categorysystems.details.title.table.headings.actions']}</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <c:forEach items="#{CategorySystemDetailsModel.title}"
-                                           var="entry">
-                                    <tr>
-                                        <td>
-                                            #{entry.key}
-                                        </td>
-                                        <td>
-                                            #{entry.value}
-                                        </td>
-                                        <td>
-                                            <div class="text-center">
-                                                <button class="btn btn-info"
-                                                        data-target="#categorysystem-title-#{entry.key}-edit"
-                                                        data-toggle="modal"
-                                                        type="button">
-                                                    <svg class="bi"
-                                                         width="1em"
-                                                         height="1em"
-                                                         fill="currentColor">
-                                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                                                    </svg>
-                                                    <span>#{AdminMessages['categorysystems.details.title.table.actions.edit']}</span>
-                                                </button>
-                                            </div>
-                                            <div aria-describedby="categorysystem-title-#{entry.key}-edit-title"
-                                                 aria-hidden="true"
-                                                 class="modal fade"
-                                                 data-backdrop="static"
-                                                 id="categorysystem-title-#{entry.key}-edit"
-                                                 tabindex="-1">
-                                                <div class="modal-dialog">
-                                                    <form action="#{mvc.uri('CategorySystemsController#editTitle', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier, 'locale': entry.key })}"
-                                                          class="modal-content"
-                                                          method="post">
-                                                        <div class="modal-header">
-                                                            <h3 class="modal-title" id="categorysystem-title-#{entry.key}-edit-title">
-                                                                #{AdminMessages['categorysystems.details.title.table.actions.edit.dialog.title']}
-                                                            </h3>
-                                                            <button aria-label="#{AdminMessages['categorysystems.details.title.edit.dialog.close']}"
-                                                                    class="close"
-                                                                    data-dismiss="modal"
-                                                                    type="button">
-                                                                <span aria-hidden="true">&times;</span>
-                                                            </button>
-                                                        </div>
-                                                        <div class="modal-body">
-                                                            <input name="locale"
-                                                                   value="#{entry.key}"
-                                                                   type="hidden" />
-                                                            <div class="form-group">
-                                                                <label for="categorysystem-title-#{entry.key}-edit-value">
-                                                                    #{AdminMessages['categorysystems.details.title.edit.dialog.value.label']}
-                                                                </label>
-                                                                <input aria-describedby="categorysystem-title-#{entry.key}-edit-value-help"
-                                                                       class="form-control"
-                                                                       id="categorysystem-title-#{entry.key}-edit-value"
-                                                                       name="value"
-                                                                       required="true"
-                                                                       type="text" 
-                                                                       value="#{entry.value}" />
-                                                                <small class="form-text text-muted"
-                                                                       id="categorysystem-title-#{entry.key}-edit-value-help">
-                                                                    #{AdminMessages['categorysystems.details.title.edit.dialog.value.help']}
-                                                                </small>
-                                                            </div>
-                                                        </div>
-                                                        <div class="modal-footer">
-                                                            <div class="modal-footer">
-                                                                <button class="btn btn-secondary" 
-                                                                        data-dismiss="modal"
-                                                                        type="button" >
-                                                                    #{AdminMessages['categorysystems.details.title.edit.dialog.close']}
-                                                                </button>
-                                                                <button type="submit" class="btn btn-primary">
-                                                                    #{AdminMessages['categorysystems.details.title.edit.dialog.submit']}
-                                                                </button>
-                                                            </div>
-                                                        </div>
-                                                    </form>
-                                                </div>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="text-center">
-                                                <button class="btn btn-danger"
-                                                        data-target="#categorysystem-title-#{entry.key}-remove"
-                                                        data-toggle="modal"
-                                                        type="button">
-                                                    <svg class="bi"
-                                                         width="1em"
-                                                         height="1em"
-                                                         fill="currentColor">
-                                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                                    </svg>
-                                                    <span>#{AdminMessages['categorysystems.details.title.table.actions.remove']}</span>
-                                                </button>
-                                            </div>
-                                            <div aria-describedby="categorysystem-title-#{entry.key}-remove-title"
-                                                 aria-hidden="true"
-                                                 class="modal fade"
-                                                 data-backdrop="static"
-                                                 id="categorysystem-title-#{entry.key}-remove"
-                                                 tabindex="-1">
-                                                <div class="modal-dialog">
-                                                    <form action="#{mvc.uri('CategorySystemsController#removeTitle', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier, 'locale': entry.key })}"
-                                                          class="modal-content"
-                                                          method="post">
-                                                        <div class="modal-header">
-                                                            <h3 class="modal-title" id="categorysystem-title-#{entry.key}-remove-title">
-                                                                #{AdminMessages['categorysystems.details.title.table.actions.remove.dialog.title']}
-                                                            </h3>
-                                                            <button aria-label="#{AdminMessages['categorysystems.details.title.remove.dialog.close']}"
-                                                                    class="close"
-                                                                    data-dismiss="modal"
-                                                                    type="button">
-                                                                <span aria-hidden="true">&times;</span>
-                                                            </button>
-                                                        </div>
-                                                        <div class="modal-body">
-                                                            <p>
-                                                                #{AdminMessages.getMessage('categorysystems.details.title.remove.dialog.message', [entry.key, entry.value])}
-                                                            </p>
-                                                            <input name="confirmed" 
-                                                                   type="hidden" 
-                                                                   value="true" />
-                                                        </div>
-                                                        <div class="modal-footer">
-                                                            <div class="modal-footer">
-                                                                <button class="btn btn-secondary" 
-                                                                        data-dismiss="modal"
-                                                                        type="button" >
-                                                                    #{AdminMessages['categorysystems.details.title.remove.dialog.close']}
-                                                                </button>
-                                                                <button type="submit" class="btn btn-danger">
-                                                                    #{AdminMessages['categorysystems.details.title.remove.dialog.submit']}
-                                                                </button>
-                                                            </div>
-                                                        </div>
-                                                    </form>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </c:forEach>
-                            </tbody>
-                        </table>
-                    </c:otherwise>
-                </c:choose>
-
-                <h2>
+<!--                <h2>
                     #{AdminMessages['categorysystems.details.description.heading']}
                 </h2>
                 <c:if test="#{CategorySystemDetailsModel.hasUnusedDescriptionLocales()}">
@@ -352,12 +160,7 @@
                                     data-target="#categorysystem-description-add"
                                     data-toggle="modal"
                                     type="button">
-                                <svg class="bi"
-                                     width="1em"
-                                     height="1em"
-                                     fill="currentColor">
-                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
-                                </svg>
+                                <bootstrap:svgIcon icon="plus-circle" />
                                 <span>#{AdminMessages['categorysystems.details.description.add']}</span>
                             </button>
                         </div>
@@ -463,12 +266,7 @@
                                                         data-target="#categorysystem-description-#{entry.key}-edit"
                                                         data-toggle="modal"
                                                         type="button">
-                                                    <svg class="bi"
-                                                         width="1em"
-                                                         height="1em"
-                                                         fill="currentColor">
-                                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                                                    </svg>
+                                                    <bootstrap:svgIcon icon="pen" />
                                                     <span>#{AdminMessages['categorysystems.details.description.table.actions.edit']}</span>
                                                 </button>
                                             </div>
@@ -538,12 +336,7 @@
                                                         data-target="#categorysystem-description-#{entry.key}-remove"
                                                         data-toggle="modal"
                                                         type="button">
-                                                    <svg class="bi"
-                                                         width="1em"
-                                                         height="1em"
-                                                         fill="currentColor">
-                                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                                    </svg>
+                                                    <bootstrap:svgIcon icon="x-circle" />
                                                     <span>#{AdminMessages['categorysystems.details.description.table.actions.remove']}</span>
                                                 </button>
                                             </div>
@@ -595,7 +388,7 @@
                             </tbody>
                         </table>
                     </c:otherwise>
-                </c:choose>
+                </c:choose>-->
 
                 <h2>
                     #{AdminMessages['categorysystems.details.owners.heading']}
@@ -606,12 +399,7 @@
                                 data-target="#categorysystem-owner-add"
                                 data-toggle="modal"
                                 type="button">
-                            <svg class="bi"
-                                 width="1em"
-                                 height="1em"
-                                 fill="currentColor">
-                                <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
-                            </svg>
+                            <bootstrap:svgIcon icon="plus-circle" />
                             <span>#{AdminMessages['categorysystems.details.owners.add']}</span>
                         </button>
                     </div>
@@ -720,12 +508,7 @@
                                                         data-target="#categorysystem-owner-#{owner.uuid}-remove"
                                                         data-toggle="modal"
                                                         type="button">
-                                                    <svg class="bi"
-                                                         width="1em"
-                                                         height="1em"
-                                                         fill="currentColor">
-                                                        <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                                    </svg>
+                                                    <bootstrap:svgIcon icon="x-circle" />
                                                     <span>#{AdminMessages['categorysystems.details.owners.remove']}</span>
                                                 </button>
                                             </div>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 1b6a15cbf..7def2b78c 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -315,7 +315,7 @@ categorysystems.details.title.edit.dialog.value.help=The new value for the title
 categorysystems.details.title.edit.dialog.submit=Save
 categorysystems.details.title.table.actions.remove.dialog.title=Remove localized title
 categorysystems.details.title.remove.dialog.close=Cancel
-categorysystems.details.title.remove.dialog.message=Are your sure to delete title "{1}" for locale?
+categorysystems.details.title.remove.dialog.message=Are your sure to remove the following localized value for the title:
 categorysystems.details.title.remove.dialog.submit=Delete title
 categorysystems.details.description.add.dialog.title=Add localized description
 categorysystems.details.description.add.dialog.locale.label=Locale
@@ -331,7 +331,7 @@ categorysystems.details.description.edit.dialog.value.help=The localized descrip
 categorysystems.details.description.edit.dialog.submit=Save
 categorysystems.details.description.table.actions.remove.dialog.title=Removed localized description
 categorysystems.details.description.remove.dialog.close=Cancel
-categorysystems.details.description.remove.dialog.message=Are your sure to delete the description for locale {0}?
+categorysystems.details.description.remove.dialog.message=Are your sure to delete the following localized value for the description:
 categorysystems.details.description.remove.dialog.submit=Remove localized description
 categorysstems.details.owner.add.dialog.title=Add Application Mapping
 categorysystems.details.owner.add.dialog.application.label=Application
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 65ffc1657..8dd46c8eb 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -315,7 +315,7 @@ categorysystems.details.title.edit.dialog.value.help=Neuer Wert f\u00fcr den Tit
 categorysystems.details.title.edit.dialog.submit=Speichern
 categorysystems.details.title.table.actions.remove.dialog.title=Lokalisierten Titel entfernen
 categorysystems.details.title.remove.dialog.close=Abbrechen
-categorysystems.details.title.remove.dialog.message=Sind Sie sicher, dass Sie den Titel "{1}" f\u00fcr die Sprache {0} entfernen wollen?
+categorysystems.details.title.remove.dialog.message=Sind Sie sicher, dass die folgende Lokalisierung f\u00fcr den Titel entfernen wollen?
 categorysystems.details.title.remove.dialog.submit=Titel entfernen
 categorysystems.details.description.add.dialog.title=Lokalisierte Beschreibung hinzuf\u00fcgen
 categorysystems.details.description.add.dialog.locale.label=Sprache

From 2cfc1c0208e068140a02e0940234293b78852416 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 15 Nov 2020 14:56:41 +0100
Subject: [PATCH 51/93] Cleanup

---
 .../categories/categorysystem-details.xhtml   | 240 ------------------
 1 file changed, 240 deletions(-)

diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index 1597d3401..c4e46983d 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -150,246 +150,6 @@
                                                 useTextarea="true"
                                                 values="#{CategorySystemDetailsModel.description}" />
 
-<!--                <h2>
-                    #{AdminMessages['categorysystems.details.description.heading']}
-                </h2>
-                <c:if test="#{CategorySystemDetailsModel.hasUnusedDescriptionLocales()}">
-                    <div class="mb-2">
-                        <div class="text-right">
-                            <button class="btn btn-secondary"
-                                    data-target="#categorysystem-description-add"
-                                    data-toggle="modal"
-                                    type="button">
-                                <bootstrap:svgIcon icon="plus-circle" />
-                                <span>#{AdminMessages['categorysystems.details.description.add']}</span>
-                            </button>
-                        </div>
-                    </div>
-                    <div class="modal fade"
-                         data-backdrop="static"
-                         id="categorysystem-description-add"
-                         tabindex="-1">
-                        <div class="modal-dialog">
-                            <form action="#{mvc.uri('CategorySystemsController#addDescription', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier })}"
-                                  class="modal-content"
-                                  method="post">
-                                <div class="modal-header">
-                                    <h3 class="modal-title">
-                                        #{AdminMessages['categorysystems.details.description.add.dialog.title']}
-                                    </h3>
-                                    <button aria-label="#{AdminMessages['categorysystems.details.title.add.dialog.close']}"
-                                            class="close" 
-                                            data-dismiss="modal" 
-                                            type="button">
-                                        <span aria-hidden="true">&times;</span>
-                                    </button>
-                                </div>
-                                <div class="modal-body">
-                                    <div class="form-group">
-                                        <label for="categorysystem-description-add-locale">
-                                            #{AdminMessages['categorysystems.details.description.add.dialog.locale.label']}
-                                        </label>
-                                        <select aria-describedby="categorysystem-description-add-locale-help"
-                                                id="categorysystem-description-add-locale"
-                                                name="locale"
-                                                required="true">
-                                            <c:forEach items="#{CategorySystemDetailsModel.unusedDescriptionLocales}" var="locale">
-                                                <option value="#{locale}">#{locale}</option>
-                                            </c:forEach>
-                                        </select>
-                                        <small class="form-text text-muted"
-                                               id="categorysystem-description-add-locale-help">
-                                            #{AdminMessages['categorysystems.details.description.add.dialog.locale.help']}
-                                        </small>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="categorysystem-description-add-value">
-                                            #{AdminMessages['categorysystems.details.description.add.dialog.value.label']}
-                                        </label>
-                                        <textarea aria-describedby="categorysystem-description-add-value-help"
-                                                  class="form-control"
-                                                  cols="80"
-                                                  id="categorysystem-description-add-value"
-                                                  name="value"
-                                                  required="true"
-                                                  rows="10"></textarea>
-                                        <small class="form-text text-muted"
-                                               id="categorysystem-description-add-locale-help">
-                                            #{AdminMessages['categorysystems.details.description.add.dialog.value.help']}
-                                        </small>
-                                    </div>
-                                </div>
-                                <div class="modal-footer">
-                                    <button class="btn btn-secondary" 
-                                            data-dismiss="modal"
-                                            type="button" >
-                                        #{AdminMessages['categorysystems.details.description.add.dialog.close']}
-                                    </button>
-                                    <button type="submit" class="btn btn-primary">
-                                        #{AdminMessages['categorysystems.details.description.add.dialog.submit']}
-                                    </button>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </c:if>
-                <c:choose>
-                    <c:when test="#{CategorySystemDetailsModel.getDescription().isEmpty()}">
-                        <p>
-                            #{AdminMessages['categorysystems.details.description.none']}
-                        </p>
-                    </c:when>
-                    <c:otherwise>
-                        <table class="table table-hover">
-                            <thead class="thead-light">
-                                <tr>
-                                    <th scope="col">#{AdminMessages['categorysystems.details.description.table.headings.locale']}</th>
-                                    <th scope="col">#{AdminMessages['categorysystems.details.description.table.headings.value']}</th>
-                                    <th class="text-center" 
-                                        colspan="2" 
-                                        scope="col">#{AdminMessages['categorysystems.details.description.table.headings.actions']}</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <c:forEach items="#{CategorySystemDetailsModel.description}"
-                                           var="entry">
-                                    <tr>
-                                        <td>
-                                            #{entry.key}
-                                        </td>
-                                        <td>
-                                            #{entry.value}
-                                        </td>
-                                        <td>
-                                            <div class="text-center">
-                                                <button class="btn btn-info"
-                                                        data-target="#categorysystem-description-#{entry.key}-edit"
-                                                        data-toggle="modal"
-                                                        type="button">
-                                                    <bootstrap:svgIcon icon="pen" />
-                                                    <span>#{AdminMessages['categorysystems.details.description.table.actions.edit']}</span>
-                                                </button>
-                                            </div>
-                                            <div aria-describedby="categorysystem-description-#{entry.key}-edit-title"
-                                                 aria-hidden="true"
-                                                 class="modal fade"
-                                                 data-backdrop="static"
-                                                 id="categorysystem-description-#{entry.key}-edit"
-                                                 tabindex="-1">
-                                                <div class="modal-dialog">
-                                                    <form action="#{mvc.uri('CategorySystemsController#editDescription', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier, 'locale': entry.key })}"
-                                                          class="modal-content"
-                                                          method="post">
-                                                        <div class="modal-header">
-                                                            <h3 class="modal-title" 
-                                                                id="categorysystem-description-#{entry.key}-edit-title">
-                                                                #{AdminMessages['categorysystems.details.description.table.actions.edit.dialog.title']}
-                                                            </h3>
-                                                            <button aria-label="#{AdminMessages['categorysystems.details.description.edit.dialog.close']}"
-                                                                    class="close"
-                                                                    data-dismiss="modal"
-                                                                    type="button">
-                                                                <span aria-hidden="true">&times;</span>
-                                                            </button>
-                                                        </div>
-                                                        <div class="modal-body">
-                                                            <input name="locale"
-                                                                   value="#{entry.key}"
-                                                                   type="hidden" />
-                                                            <div class="form-group">
-                                                                <label for="categorysystem-description-#{entry.key}-edit-value">
-                                                                    #{AdminMessages['categorysystems.details.description.edit.dialog.value.label']}
-                                                                </label>
-                                                                <textarea aria-describedby="categorysystem-description-#{entry.key}-edit-value-help"
-                                                                          class="form-control"
-                                                                          cols="80"
-                                                                          id="categorysystem-description-#{entry.key}-edit-value"
-                                                                          name="value"
-                                                                          required="true"
-                                                                          rows="10"
-                                                                          type="text">#{entry.value}</textarea>
-                                                                <small class="form-text text-muted"
-                                                                       id="categorysystem-description-#{entry.key}-edit-value-help">
-                                                                    #{AdminMessages['categorysystems.details.description.edit.dialog.value.help']}
-                                                                </small>
-                                                            </div>
-                                                        </div>
-                                                        <div class="modal-footer">
-                                                            <div class="modal-footer">
-                                                                <button class="btn btn-secondary" 
-                                                                        data-dismiss="modal"
-                                                                        type="button" >
-                                                                    #{AdminMessages['categorysystems.details.description.edit.dialog.close']}
-                                                                </button>
-                                                                <button type="submit" class="btn btn-primary">
-                                                                    #{AdminMessages['categorysystems.details.description.edit.dialog.submit']}
-                                                                </button>
-                                                            </div>
-                                                        </div>
-                                                    </form>
-                                                </div>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="text-center">
-                                                <button class="btn btn-danger"
-                                                        data-target="#categorysystem-description-#{entry.key}-remove"
-                                                        data-toggle="modal"
-                                                        type="button">
-                                                    <bootstrap:svgIcon icon="x-circle" />
-                                                    <span>#{AdminMessages['categorysystems.details.description.table.actions.remove']}</span>
-                                                </button>
-                                            </div>
-                                            <div aria-describedby="categorysystem-description-#{entry.key}-remove-title"
-                                                 aria-hidden="true"
-                                                 class="modal fade"
-                                                 data-backdrop="static"
-                                                 id="categorysystem-description-#{entry.key}-remove"
-                                                 tabindex="-1">
-                                                <div class="modal-dialog">
-                                                    <form action="#{mvc.uri('CategorySystemsController#removeDescription', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier, 'locale': entry.key })}"
-                                                          class="modal-content"
-                                                          method="post">
-                                                        <div class="modal-header">
-                                                            <h3 class="modal-description" id="categorysystem-description-#{entry.key}-remove-title">
-                                                                #{AdminMessages['categorysystems.details.description.table.actions.remove.dialog.title']}
-                                                            </h3>
-                                                            <button aria-label="#{AdminMessages['categorysystems.details.description.remove.dialog.close']}"
-                                                                    class="close"
-                                                                    data-dismiss="modal"
-                                                                    type="button">
-                                                                <span aria-hidden="true">&times;</span>
-                                                            </button>
-                                                        </div>
-                                                        <div class="modal-body">
-                                                            <p>
-                                                                #{AdminMessages.getMessage('categorysystems.details.description.remove.dialog.message', [entry.key, entry.value])}
-                                                            </p>
-                                                            <input name="confirmed" 
-                                                                   type="hidden" 
-                                                                   value="true" />
-                                                        </div>
-                                                        <div class="modal-footer">
-                                                            <button class="btn btn-secondary" 
-                                                                    data-dismiss="modal"
-                                                                    type="button" >
-                                                                #{AdminMessages['categorysystems.details.description.remove.dialog.close']}
-                                                            </button>
-                                                            <button type="submit" class="btn btn-danger">
-                                                                #{AdminMessages['categorysystems.details.description.remove.dialog.submit']}
-                                                            </button>
-                                                        </div>
-                                                    </form>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </c:forEach>
-                            </tbody>
-                        </table>
-                    </c:otherwise>
-                </c:choose>-->
-
                 <h2>
                     #{AdminMessages['categorysystems.details.owners.heading']}
                 </h2>

From 5ddfa1686d5dabe48055597a196099680033b020 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 15 Nov 2020 14:56:53 +0100
Subject: [PATCH 52/93] Fixed a typo

---
 .../admin/categories/CategorySystemsController.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
index 866b47262..c4f6c4e87 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
@@ -109,8 +109,7 @@ public class CategorySystemsController {
         switch (identifier.getType()) {
             case ID:
                 result = domainRepository.findById(
-                    Long.parseLong(identifier.getIdentifier()
-                    )
+                    Long.parseLong(identifier.getIdentifier())
                 );
                 break;
             case UUID:
@@ -659,8 +658,8 @@ public class CategorySystemsController {
             }
 
             return String.format(
-                "redirect:categorymanager/categorysystems/ID-%s/details",
-                categorySystemIdentifier
+                "redirect:categorymanager/categorysystems/ID-%d/details",
+                domain.getObjectId()
             );
         } else {
             categorySystemDetailsModel.addMessage(
@@ -734,8 +733,8 @@ public class CategorySystemsController {
             }
 
             return String.format(
-                "redirect:categorymanager/categorysystems/ID-%s/details",
-                categorySystemIdentifier
+                "redirect:categorymanager/categorysystems/ID-%d/details",
+                domain.getObjectId()
             );
         } else {
             categorySystemDetailsModel.addMessage(

From 73a0a7945400ff2e2df2697d7b0fc96eea8cf219 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 15 Nov 2020 14:57:59 +0100
Subject: [PATCH 53/93] Missing categories

---
 .../ui/admin/categories/categorysystem-details.xhtml        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index c4e46983d..c972edf9f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -241,13 +241,13 @@
                         <table class="table table-hover">
                             <thead>
                                 <tr>
-                                    <th>
+                                    <th scope="col">
                                         #{AdminMessages['categorysystems.details.owners.applicationname']}
                                     </th>
-                                    <th>
+                                    <th scope="col">
                                         #{AdminMessages['categorysystems.details.owners.context']}
                                     </th>
-                                    <th>
+                                    <th class="text-center" scope="col">
                                         #{AdminMessages['categorysystems.details.owners.actions']}
                                     </th>
                                 </tr>

From 08bfb9eb976ef5f301e2b739d6f591c87501fdb4 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 15 Nov 2020 16:11:56 +0100
Subject: [PATCH 54/93] Table for Root Categories

---
 .../CategorySystemDetailsModel.java           |  29 +++-
 .../ui/admin/categories/CategoryTableRow.java | 137 ++++++++++++++++++
 .../categories/categorysystem-details.xhtml   |  95 +++++++++++-
 .../org/libreccm/ui/AdminBundle.properties    |  14 ++
 .../org/libreccm/ui/AdminBundle_de.properties |  16 +-
 5 files changed, 287 insertions(+), 4 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryTableRow.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index 0baf31e0d..03cd16803 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -20,9 +20,7 @@ package org.libreccm.ui.admin.categories;
 
 import org.libreccm.categorization.Domain;
 import org.libreccm.categorization.DomainOwnership;
-import org.libreccm.configuration.ConfigurationManager;
 import org.libreccm.l10n.GlobalizationHelper;
-import org.libreccm.l10n.LocalizedTextsUtil;
 import org.libreccm.ui.Message;
 import org.libreccm.web.ApplicationRepository;
 import org.libreccm.web.CcmApplication;
@@ -82,6 +80,10 @@ public class CategorySystemDetailsModel {
     private List<CategorySystemOwnerRow> owners;
 
     private List<CategorySystemOwnerOption> ownerOptions;
+    
+    private String rootIdentifier;
+    
+    private List<CategoryTableRow> categories;
 
     private final List<Message> messages;
 
@@ -103,6 +105,14 @@ public class CategorySystemDetailsModel {
     public String getIdentifier() {
         return String.format("ID-%d", categorySystemId);
     }
+    
+    public String getRootIdentifier() {
+        return String.format("UUID-%s", rootIdentifier);
+    }
+    
+    protected void setRootIdentifier(final String rootIdentifier) {
+        this.rootIdentifier = rootIdentifier;
+    }
 
     public String getUuid() {
         return uuid;
@@ -184,6 +194,10 @@ public class CategorySystemDetailsModel {
         return Collections.unmodifiableList(ownerOptions);
     }
 
+    public List<CategoryTableRow> getCategories() {
+        return Collections.unmodifiableList(categories);
+    }
+    
     public boolean isNew() {
         return categorySystemId == 0;
     }
@@ -288,6 +302,17 @@ public class CategorySystemDetailsModel {
             .map(CategorySystemOwnerOption::new)
             .sorted()
             .collect(Collectors.toList());
+        
+
+        rootIdentifier = String.format("UUID-%s", domain.getRoot().getUuid());
+        
+        categories = domain
+            .getRoot()
+            .getSubCategories()
+            .stream()
+            .map(CategoryTableRow::new)
+            .sorted()
+            .collect(Collectors.toList());
     }
 
     private CategorySystemOwnerRow buildOwnerRow(
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryTableRow.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryTableRow.java
new file mode 100644
index 000000000..ddb95eb26
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryTableRow.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import org.libreccm.categorization.Category;
+
+import java.util.Objects;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class CategoryTableRow implements Comparable<CategoryTableRow> {
+
+    private long categoryId;
+
+    private String uuid;
+
+    private String uniqueId;
+
+    private String name;
+
+    private boolean enabled;
+
+    private boolean visible;
+
+    private boolean abstractCategory;
+
+    private long categoryOrder;
+
+    public CategoryTableRow() {
+        super();
+    }
+    
+    public CategoryTableRow(final Category category) {
+        categoryId = category.getObjectId();
+        uuid = category.getUuid();
+        uniqueId = category.getUniqueId();
+        name = category.getName();
+        enabled = category.isEnabled();
+        visible = category.isVisible();
+        abstractCategory = category.isAbstractCategory();
+        categoryOrder = category.getCategoryOrder();
+    }
+    
+    public long getCategoryId() {
+        return categoryId;
+    }
+
+    protected void setCategoryId(final long categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    protected void setUuid(final String uuid) {
+        this.uuid = uuid;
+    }
+    
+    public String getIdentifier() {
+        return String.format("UUID-%s", uuid);
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    protected void setUniqueId(final String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    protected void setName(final String name) {
+        this.name = name;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    protected void setEnabled(final boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+
+    protected void setVisible(final boolean visible) {
+        this.visible = visible;
+    }
+
+    public boolean isAbstractCategory() {
+        return abstractCategory;
+    }
+
+    protected void setAbstractCategory(final boolean abstractCategory) {
+        this.abstractCategory = abstractCategory;
+    }
+
+    public long getCategoryOrder() {
+        return categoryOrder;
+    }
+
+    protected void setCategoryOrder(final long categoryOrder) {
+        this.categoryOrder = categoryOrder;
+    }
+
+    @Override
+    public int compareTo(final CategoryTableRow other) {
+        return Long.compare(
+            categoryOrder, Objects.requireNonNull(other).getCategoryOrder()
+        );
+    }
+
+}
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index c972edf9f..c6b4e5da1 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -115,7 +115,7 @@
                                                 title="#{AdminMessages['categorysystems.details.title.heading']}"
                                                 unusedLocales="#{CategorySystemDetailsModel.unusedTitleLocales}"
                                                 values="#{CategorySystemDetailsModel.title}" />
-                
+
                 <libreccm:localizedStringEditor addMethod="CategorySystemsController#addDescription"
                                                 addButtonLabel="#{AdminMessages['categorysystems.details.description.add']}"
                                                 addDialogCancelLabel="#{AdminMessages['categorysystems.details.description.add.dialog.close']}"
@@ -322,6 +322,99 @@
                         </table>
                     </c:otherwise>
                 </c:choose>
+
+                <h2>#{AdminMessages['categorysystems.details.categories.heading']}</h2>
+                <div class="mb-2">
+                    <div class="text-right">
+                        <a class="btn btn-secondary"
+                           data-target="#categorysystem-category-add"
+                           data-toggle="modal"
+                           href="#{mvc.uri('CategoriesController#newSubCategory', {'categoryIdentifier': CategorySystemDetailsModel.rootIdentifier})}"
+                           type="button">
+                            <bootstrap:svgIcon icon="plus-circle" />
+                            <span>#{AdminMessages['categorysystems.details.categories.add']}</span>
+                        </a>
+                    </div>
+                </div>
+                <c:choose>
+                    <c:when test="#{CategorySystemDetailsModel.categories.isEmpty()}">
+                        <p>
+                            #{AdminMessages['categorysystems.details.categories.none']}
+                        </p>
+                    </c:when>
+                    <c:otherwise>
+                        <table class="table table-hover">
+                            <thead>
+                                <tr>
+                                    <th scope="col">
+                                        #{AdminMessages['categorysystems.details.categories.table.headings.name']}
+                                    </th>
+                                    <th>
+                                        #{AdminMessages['categorysystems.details.categories.table.headings.enabled']}
+                                    </th>
+                                    <th>
+                                        #{AdminMessages['categorysystems.details.categories.table.headings.visible']}
+                                    </th>
+                                    <th>
+                                        #{AdminMessages['categorysystems.details.categories.table.headings.abstract']}
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <c:forEach items="#{CategorySystemDetailsModel.categories}" 
+                                           var="category">
+                                    <tr>
+                                        <td>
+                                            <a href="#{mvc.uri('CategoriesController#getCategory', { 'categoryIdentifier': category.identifier})}">
+                                                #{category.name}
+                                            </a>
+                                        </td>
+                                        <td>
+                                            <c:choose>
+                                                <c:when test="#{category.enabled}">
+                                                    #{AdminMessages['categorysystems.details.categories.table.headings.enabled.true']}
+                                                </c:when>
+                                                <c:otherwise>
+                                                    #{AdminMessages['categorysystems.details.categories.table.headings.enabled.false']}
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </td>
+                                        <td>
+                                            <c:choose>
+                                                <c:when test="#{category.visible}">
+                                                    #{AdminMessages['categorysystems.details.categories.table.headings.visible.true']}
+                                                </c:when>
+                                                <c:otherwise>
+                                                    #{AdminMessages['categorysystems.details.categories.table.headings.visible.false']}
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </td>
+                                        <td>
+                                            <c:choose>
+                                                <c:when test="#{category.abstractCategory}">
+                                                    #{AdminMessages['categorysystems.details.categories.table.headings.abstract.true']}
+                                                </c:when>
+                                                <c:otherwise>
+                                                    #{AdminMessages['categorysystems.details.categories.table.headings.abstract.false']}
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </td>
+                                        <td class="text-center">
+                                            <button class="btn btn-danger"
+                                                    data-target="#categorysystem-categories-#{category.uuid}-delete"
+                                                    data-toggle="modal"
+                                                    type="button">
+                                                <bootstrap:svgIcon icon="x-circle" />
+                                                <span>#{AdminMessages['categorysystems.details.categories.delete']}</span>
+                                            </button>
+                                            <!-- ToDo: Delete Dialog -->
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </tbody>
+                        </table>
+                    </c:otherwise>
+                </c:choose>
             </div>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 7def2b78c..84b772845 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -344,3 +344,17 @@ categorysystems.details.owners.remove.message=Are your sure to remove the mappin
 categorysystems.details.owners.remove.submit=Remove mapping
 categorysystems.details.owner.add.dialog.context.label=Context
 categorysystems.details.owner.add.dialog.context.help=Context for the mapping
+categorysystems.details.categories.heading=Categories
+categorysystems.details.categories.add=Add category
+categorysystems.details.categories.none=No categories
+categorysystems.details.categories.table.headings.name=Name
+categorysystems.details.categories.table.headings.enabled=Enabled?
+categorysystems.details.categories.table.headings.visible=Visible?
+categorysystems.details.categories.table.headings.abstract=Abstract category?
+categorysystems.details.categories.table.headings.enabled.true=Yes
+categorysystems.details.categories.table.headings.enabled.false=No
+categorysystems.details.categories.table.headings.visible.true=Yes
+categorysystems.details.categories.table.headings.visible.false=No
+categorysystems.details.categories.table.headings.abstract.true=Yes
+categorysystems.details.categories.table.headings.abstract.false=No
+categorysystems.details.categories.delete=Delete
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 8dd46c8eb..893282d4c 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -331,7 +331,7 @@ categorysystems.details.description.edit.dialog.value.help=Die lokalisierte Besc
 categorysystems.details.description.edit.dialog.submit=Speichern
 categorysystems.details.description.table.actions.remove.dialog.title=Lokalisierte Beschreibung entfernen
 categorysystems.details.description.remove.dialog.close=Abbrechen
-categorysystems.details.description.remove.dialog.message=Sind Sie sicher das die Beschreibung f\u00fcr die Sprache {0} entfernen wollen?
+categorysystems.details.description.remove.dialog.message=Sind Sie sicher, dass Sie die folgende Lokalisierung f\u00fcr die Sprache entfernen wollen:
 categorysystems.details.description.remove.dialog.submit=Lokalisierte Beschreibung entfernen
 categorysstems.details.owner.add.dialog.title=Applikation hinzuf\u00fcgen
 categorysystems.details.owner.add.dialog.application.label=Anwendung
@@ -344,3 +344,17 @@ categorysystems.details.owners.remove.message=Sind Sie sicher das die Applicatio
 categorysystems.details.owners.remove.submit=Zuordnung entfernen
 categorysystems.details.owner.add.dialog.context.label=Context
 categorysystems.details.owner.add.dialog.context.help=Context for the mapping
+categorysystems.details.categories.heading=Kategorien
+categorysystems.details.categories.add=Kategorie hinzuf\u00fcgen
+categorysystems.details.categories.none=Keine Kategorien vorhanden
+categorysystems.details.categories.table.headings.name=Name
+categorysystems.details.categories.table.headings.enabled=Aktiv?
+categorysystems.details.categories.table.headings.visible=Sichtbar?
+categorysystems.details.categories.table.headings.abstract=Abstrakte Kategorie?
+categorysystems.details.categories.table.headings.enabled.true=Ja
+categorysystems.details.categories.table.headings.enabled.false=Nein
+categorysystems.details.categories.table.headings.visible.true=Ja
+categorysystems.details.categories.table.headings.visible.false=Nein
+categorysystems.details.categories.table.headings.abstract.true=Ja
+categorysystems.details.categories.table.headings.abstract.false=Nein
+categorysystems.details.categories.delete=L\u00f6schen

From 550446b183c172145a18259b8ae17c4ecd7a8152 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 16 Nov 2020 20:32:04 +0100
Subject: [PATCH 55/93] Some additional components

---
 .../categories/CategoriesController.java      |   3 +-
 .../components/bootstrap/modalForm.xhtml      |  79 ++++++++++
 .../components/libreccm/messages.xhtml        |  21 +++
 .../categories/categorysystem-details.xhtml   | 135 ++++++++----------
 4 files changed, 160 insertions(+), 78 deletions(-)
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/modalForm.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/libreccm/messages.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
index f79eda73a..af84030bb 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
@@ -38,6 +38,7 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
+import javax.mvc.MvcContext;
 import javax.transaction.Transactional;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
@@ -71,7 +72,7 @@ public class CategoriesController {
 
     @Inject
     private Models models;
-
+    
     @GET
     @Path("/{categoryIdentifier}")
     @AuthorizationRequired
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/modalForm.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/modalForm.xhtml
new file mode 100644
index 000000000..f4d918067
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/modalForm.xhtml
@@ -0,0 +1,79 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+    <cc:interface shortDescription="Component for showing messages (org.libreccm.ui.Message).">
+        <cc:attribute name="actionTarget"
+                      required="true"
+                      shortDescription="URL to which the form is send." />
+        <cc:attribute name="buttonClass"
+                      default="btn-secondary"
+                      required="false"
+                      shortDescription="Bootstrap button context class to use for the button toggleing the modal form, eg. button-info."
+                      type="String" />
+        <cc:attribute name="buttonIcon"
+                      default=""
+                      required="false"
+                      shortDescription="Name of the icon to use in the button. If empty no icon will be used."
+                      type="String" />
+        <cc:attribute name="buttonText"
+                      required="true"
+                      shortDescription="Text for the button toggleing the modal form."
+                      type="String" />
+        <cc:attribute name="buttonTextClass"
+                      default=""
+                      required="false"
+                      shortDescription="Class used for aligning the button. Either text-left, text-center or text-right."
+                      type="String" />
+        <cc:attribute name="dialogId"
+                      required="true"
+                      shortDescription="ID for the dialog."
+                      type="String" />
+        <cc:attribute name="method"
+                      default="post"
+                      required="false"
+                      shortDescription="Method used to send to form. Defaults to POST."
+                      type="String" />
+        <cc:facet name="body" required="true" />
+        <cc:facet name="footer" required="true"/>
+        <cc:facet name="title" required="true" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="#{cc.attrs.buttonTextClass}">
+            <button aria-labelledby="#{cc.attrs.dialogId}-title"
+                class="btn #{cc.attrs.buttonClass}"
+                    data-target="##{cc.attrs.dialogId}"
+                    data-toggle="modal"
+                    type="button">
+                <c:if test="#{!cc.attrs.buttonIcon.isEmpty()}">
+                    <bootstrap:svgIcon icon="#{cc.attrs.buttonIcon}" />
+                </c:if>
+                <span>#{cc.attrs.buttonText}</span>
+            </button>
+        </div>
+        <div class="modal fade"
+             data-backdrop="static"
+             id="#{cc.attrs.dialogId}"
+             tabindex="-1">
+            <div class="modal-dialog">
+                <form action="#{cc.attrs.actionTarget}"
+                      class="modal-content"
+                      method="#{cc.attrs.method}">
+                    <div class="modal-header">
+                        <div class="modal-title" 
+                             id="#{cc.attrs.dialogId}-title">
+                            <cc:renderFacet name="title" />
+                        </div>
+                    </div>
+                    <div class="modal-body">
+                        <cc:renderFacet name="body" />
+                    </div>
+                    <div class="modal-footer">
+                        <cc:renderFacet name="footer" />
+                    </div>
+                </form>
+            </div>
+        </div>
+    </cc:implementation>
+</html>
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/libreccm/messages.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/messages.xhtml
new file mode 100644
index 000000000..fcf8899f0
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/messages.xhtml
@@ -0,0 +1,21 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+    <cc:interface shortDescription="Component for showing messages (org.libreccm.ui.Message).">
+        <cc:attribute name="messages" 
+                      required="true"
+                      shortDescription="The messages to show"
+                      type="java.util.Collection" />
+    </cc:interface>
+    <cc:implementation>
+        <div>
+            <c:forEach items="#{cc.attrs.message}" var="message">
+                <div class="alert alert-#{message.messageTypeClass}" 
+                     role="alert">
+                    #{message.message}
+                </div>
+            </c:forEach>
+        </div>
+    </cc:implementation>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index c6b4e5da1..d1662ecf6 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -4,7 +4,8 @@
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
         <ui:param name="activePage" value="categories" />
@@ -25,6 +26,8 @@
             <div class="container">
                 <h1>#{AdminMessages.getMessage('categorysystems.details.title', [CategorySystemDetailsModel.domainKey])}</h1>
 
+                <libreccm:messages messages="#{CategorySystemDetailsModel.messages}" />
+
                 <dl>
                     <div>
                         <dt>
@@ -154,82 +157,60 @@
                     #{AdminMessages['categorysystems.details.owners.heading']}
                 </h2>
                 <div class="mb-2">
-                    <div class="text-right">
-                        <button class="btn btn-secondary"
-                                data-target="#categorysystem-owner-add"
-                                data-toggle="modal"
-                                type="button">
-                            <bootstrap:svgIcon icon="plus-circle" />
-                            <span>#{AdminMessages['categorysystems.details.owners.add']}</span>
-                        </button>
-                    </div>
-                    <div class="modal fade"
-                         data-backdrop="static"
-                         id="categorysystem-owner-add"
-                         tabindex="-1">
-                        <div class="modal-dialog">
-                            <form action="#{mvc.uri('CategorySystemsController#addOwner', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier })}"
-                                  class="modal-content"
-                                  method="post">
-                                <div class="modal-header">
-                                    <h3 class="modal-title">
-                                        #{AdminMessages['categorysstems.details.owner.add.dialog.title']}
-                                    </h3>
-                                    <button aria-label="#{AdminMessages['categorysystems.details.owner.add.dialog.close']}"
-                                            class="close"
-                                            data-dismiss="modal"
-                                            type="button">
-                                        <span aria-hidden="true">&times;</span>
-                                    </button>
-                                </div>
-                                <div class="modal-body">
-                                    <div class="form-group">
-                                        <label for="categorysystem-owner-add-application">
-                                            #{AdminMessages['categorysystems.details.owner.add.dialog.application.label']}
-                                        </label>
-                                        <select aria-describedby="categorysystem-owner-add-application-help"
-                                                id="categorysystem-owner-add-appliaction"
-                                                name="applicationUuid"
-                                                required="true"
-                                                size="1">
-                                            <c:forEach items="#{CategorySystemDetailsModel.ownerOptions}" var="application">
-                                                <option value="#{application.applicationUuid}">
-                                                    #{application.applicationName}
-                                                </option>
-                                            </c:forEach>
-                                        </select>
-                                        <small class="form-text text-muted"
-                                               id="categorysystem-owner-add-application-help">
-                                            #{AdminMessages['categorysystems.details.owner.add.dialog.application.help']}
-                                        </small>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="categorysystem-owner-add-context">
-                                            #{AdminMessages['categorysystems.details.owner.add.dialog.context.label']}
-                                        </label>
-                                        <input aria-describedby="categorysystem-owner-add-context-help"
-                                               id="categorysystem-owner-add-context"
-                                               name="context"
-                                               type="text" />
-                                        <small class="form-text text-muted"
-                                               id="categorysystem-owner-add-context-help">
-                                            #{AdminMessages['categorysystems.details.owner.add.dialog.context.help']}
-                                        </small>
-                                    </div>
-                                    <div class="modal-footer">
-                                        <button class="btn btn-secondary" 
-                                                data-dismiss="modal"
-                                                type="button" >
-                                            #{AdminMessages['categorysystems.details.owner.add.dialog.close']}
-                                        </button>
-                                        <button type="submit" class="btn btn-primary">
-                                            #{AdminMessages['categorysystems.details.owner.add.dialog.submit']}
-                                        </button>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
+                    <bootstrap:modalForm actionTarget="#{mvc.uri('CategorySystemsController#addOwner', {'categorySystemIdentifier': CategorySystemDetailsModel.identifier })}"
+                                         buttonIcon="plus-circle"
+                                         buttonText="#{AdminMessages['categorysystems.details.owners.add']}"
+                                         buttonTextClass="text-right"
+                                         dialogId="categorysystem-owner-add">
+                        <f:facet name="title">
+                            <h3>#{AdminMessages['categorysstems.details.owner.add.dialog.title']}</h3>
+                        </f:facet>
+                        <f:facet name="body">
+                            <div class="form-group">
+                                <label for="categorysystem-owner-add-application">
+                                    #{AdminMessages['categorysystems.details.owner.add.dialog.application.label']}
+                                </label>
+                                <select aria-describedby="categorysystem-owner-add-application-help"
+                                        id="categorysystem-owner-add-appliaction"
+                                        name="applicationUuid"
+                                        required="true"
+                                        size="1">
+                                    <c:forEach items="#{CategorySystemDetailsModel.ownerOptions}" var="application">
+                                        <option value="#{application.applicationUuid}">
+                                            #{application.applicationName}
+                                        </option>
+                                    </c:forEach>
+                                </select>
+                                <small class="form-text text-muted"
+                                       id="categorysystem-owner-add-application-help">
+                                    #{AdminMessages['categorysystems.details.owner.add.dialog.application.help']}
+                                </small>
+                            </div>
+                            <div class="form-group">
+                                <label for="categorysystem-owner-add-context">
+                                    #{AdminMessages['categorysystems.details.owner.add.dialog.context.label']}
+                                </label>
+                                <input aria-describedby="categorysystem-owner-add-context-help"
+                                       id="categorysystem-owner-add-context"
+                                       name="context"
+                                       type="text" />
+                                <small class="form-text text-muted"
+                                       id="categorysystem-owner-add-context-help">
+                                    #{AdminMessages['categorysystems.details.owner.add.dialog.context.help']}
+                                </small>
+                            </div>
+                        </f:facet>
+                        <f:facet name="footer">
+                            <button class="btn btn-secondary" 
+                                    data-dismiss="modal"
+                                    type="button" >
+                                #{AdminMessages['categorysystems.details.owner.add.dialog.close']}
+                            </button>
+                            <button type="submit" class="btn btn-primary">
+                                #{AdminMessages['categorysystems.details.owner.add.dialog.submit']}
+                            </button>
+                        </f:facet>
+                    </bootstrap:modalForm>
                 </div>
                 <c:choose>
                     <c:when test="#{CategorySystemDetailsModel.getOwners().isEmpty()}">

From a9a16311b349a95a2d846ccfa6d46f070ab1b039 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 18 Nov 2020 16:48:43 +0100
Subject: [PATCH 56/93] Typos

---
 .../ui/admin/categories/CategorySystemDetailsModel.java   | 2 +-
 .../org/libreccm/ui/admin/categories/category-form.xhtml  | 8 ++++++++
 .../ui/admin/categories/categorysystem-details.xhtml      | 2 --
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index 03cd16803..2487a9535 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -107,7 +107,7 @@ public class CategorySystemDetailsModel {
     }
     
     public String getRootIdentifier() {
-        return String.format("UUID-%s", rootIdentifier);
+        return rootIdentifier;
     }
     
     protected void setRootIdentifier(final String rootIdentifier) {
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
index f828f658d..5322ece0f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
@@ -1,5 +1,6 @@
 <!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">
@@ -17,6 +18,13 @@
         <ui:define name="main">
             <div class="container">
                 <h1>#{AdminMessages['categories.label']}</h1>
+                
+                <form action="#" method="post">
+                    <bootstrap:formGroupText help="test"
+                                             inputId="test"
+                                             label="Test"
+                                             name="test" />
+                </form>
                 <p>ToDo</p>
             </div>
         </ui:define>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index d1662ecf6..7237d8541 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -308,8 +308,6 @@
                 <div class="mb-2">
                     <div class="text-right">
                         <a class="btn btn-secondary"
-                           data-target="#categorysystem-category-add"
-                           data-toggle="modal"
                            href="#{mvc.uri('CategoriesController#newSubCategory', {'categoryIdentifier': CategorySystemDetailsModel.rootIdentifier})}"
                            type="button">
                             <bootstrap:svgIcon icon="plus-circle" />

From 6a6a9f67f8b2fa034fd83fe9d58b7c9d61767133 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 18 Nov 2020 16:48:55 +0100
Subject: [PATCH 57/93] JSF Component for the bootstrap form group

---
 .../components/bootstrap/formGroupText.xhtml  | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml

diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
new file mode 100644
index 000000000..60f4a856e
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
+    <cc:interface shortDescription="Component for a form group with a text input">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="maxlength" 
+                      required="false"
+                      shortDescription="Maximum length of the text in this field."
+                      type="int" />
+        <cc:attribute name="minlength" 
+                      required="false"
+                      shortDescription="Minium length of the text in this field."
+                      type="int" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server."
+                      type="String" />
+        <cc:attribute name="pattern"
+                      required="false"
+                      shortDescription="A RegEx pattern that the value entered into this field must match"
+                      type="String" />
+        <cc:attribute name="placeholder"
+                      required="false"
+                      shortDescription="A placeholder to show in the empty field."
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="size"
+                      shortDescription="Length of the field. Can be overwritten using CSS."
+                      required="false"
+                      type="int" />
+        <cc:attribute name="value"
+                      default=""
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <c:if test="#{cc.attrs.value.length() > 0}">
+            <pre>has value</pre>
+        </c:if>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   id="#{cc.attrs.inputId}"
+                   maxlength="#{(not empty cc.attrs.maxlength) ? cc.attrs.maxlength : null}"
+                   minlength="#{(not empty cc.attrs.minlength) ? cc.attrs.minlength : null}"
+                   name="#{cc.attrs.name}"
+                   pattern="#{not empty cc.attrs.pattern ? cc.attrs.pattern : null}"
+                   placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder: null}"
+                   required="#{cc.attrs.required ? 'required' : ''}"
+                   size="#{not empty cc.attrs.size ? cc.attrs.size : null}"
+                   value="#{not empty cc.attrs.value ? cc.attrs.value : ''}"
+                   type="text" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+

From b23c1f8f2501ae50087a8051bd804664e9360eab Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 18 Nov 2020 17:04:59 +0100
Subject: [PATCH 58/93] Base component for Bootstrap form groups

---
 .../components/bootstrap/formGroup.xhtml      | 33 +++++++++++++++
 .../components/bootstrap/formGroupText.xhtml  | 41 +++++++++----------
 2 files changed, 52 insertions(+), 22 deletions(-)
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroup.xhtml

diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroup.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroup.xhtml
new file mode 100644
index 000000000..615f7a3d6
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroup.xhtml
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
+    <cc:interface shortDescription="A base component for form groups. The control (input) is added by the input facet.">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+
+        <cc:facet name="input" required="true" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <cc:renderFacet name="input" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
index 60f4a856e..2f0cd4f8c 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
+<html xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns="http://www.w3.org/1999/xhtml"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:cc="http://xmlns.jcp.org/jsf/composite"
       xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -52,27 +53,23 @@
                       type="String" />
     </cc:interface>
     <cc:implementation>
-        <c:if test="#{cc.attrs.value.length() > 0}">
-            <pre>has value</pre>
-        </c:if>
-        <div class="form-group">
-            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
-            <input aria-describedby="#{cc.attrs.inputId}-help"
-                   id="#{cc.attrs.inputId}"
-                   maxlength="#{(not empty cc.attrs.maxlength) ? cc.attrs.maxlength : null}"
-                   minlength="#{(not empty cc.attrs.minlength) ? cc.attrs.minlength : null}"
-                   name="#{cc.attrs.name}"
-                   pattern="#{not empty cc.attrs.pattern ? cc.attrs.pattern : null}"
-                   placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder: null}"
-                   required="#{cc.attrs.required ? 'required' : ''}"
-                   size="#{not empty cc.attrs.size ? cc.attrs.size : null}"
-                   value="#{not empty cc.attrs.value ? cc.attrs.value : ''}"
-                   type="text" />
-            <small class="form-text text-muted"
-                   id="#{cc.attrs.inputId}-help">
-                #{cc.attrs.help}
-            </small>
-        </div>
+        <bootstrap:formGroup help="#{cc.attrs.help}"
+                             inputId="#{cc.attrs.inputId}"
+                             label="#{cc.attrs.label}">
+            <f:facet name="input">
+                <input aria-describedby="#{cc.attrs.inputId}-help"
+                       id="#{cc.attrs.inputId}"
+                       maxlength="#{(not empty cc.attrs.maxlength) ? cc.attrs.maxlength : null}"
+                       minlength="#{(not empty cc.attrs.minlength) ? cc.attrs.minlength : null}"
+                       name="#{cc.attrs.name}"
+                       pattern="#{not empty cc.attrs.pattern ? cc.attrs.pattern : null}"
+                       placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder: null}"
+                       required="#{cc.attrs.required ? 'required' : ''}"
+                       size="#{not empty cc.attrs.size ? cc.attrs.size : null}"
+                       value="#{not empty cc.attrs.value ? cc.attrs.value : ''}"
+                       type="text" />
+            </f:facet>
+        </bootstrap:formGroup>
     </cc:implementation>
 </html>
 

From 242ac9804388103ca4ea2f5bd06760b4d3601520 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 18 Nov 2020 19:42:41 +0100
Subject: [PATCH 59/93] Component for Bootstrap form group with input of type
 number

---
 .../components/bootstrap/formGroup.xhtml      | 33 --------
 .../bootstrap/formGroupNumber.xhtml           | 80 +++++++++++++++++++
 .../components/bootstrap/formGroupText.xhtml  | 39 ++++-----
 .../ui/admin/categories/category-form.xhtml   |  9 ++-
 4 files changed, 108 insertions(+), 53 deletions(-)
 delete mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroup.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml

diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroup.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroup.xhtml
deleted file mode 100644
index 615f7a3d6..000000000
--- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroup.xhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
-      xmlns:f="http://xmlns.jcp.org/jsf/core">
-    <cc:interface shortDescription="A base component for form groups. The control (input) is added by the input facet.">
-        <cc:attribute name="help"
-                      required="true"
-                      shortDescription="A short description of the input field"
-                      type="String" />
-        <cc:attribute name="inputId" 
-                      required="true" 
-                      shortDescription="The ID of the input field."
-                      type="String" />
-        <cc:attribute name="label"
-                      required="true"
-                      shortDescription="The label of the input field."
-                      type="String" />
-
-        <cc:facet name="input" required="true" />
-    </cc:interface>
-    <cc:implementation>
-        <div class="form-group">
-            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
-            <cc:renderFacet name="input" />
-            <small class="form-text text-muted"
-                   id="#{cc.attrs.inputId}-help">
-                #{cc.attrs.help}
-            </small>
-        </div>
-    </cc:implementation>
-</html>
-
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml
new file mode 100644
index 000000000..ed31d82a2
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml
@@ -0,0 +1,80 @@
+<!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:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
+    <cc:interface shortDescription="Component for a form group with a number input">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="max"
+                      required="false"
+                      shortDescription="Maximum allowed value."
+                      type="String" />
+        <cc:attribute name="min"
+                      required="false"
+                      shortDescription="Minimum allowed value."
+                      type="String" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server." 
+                      type="String" />
+        <cc:attribute name="placeholder"
+                      required="false"
+                      shortDescription="A placeholder to show in the empty field."
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="step"
+                      required="false"
+                      shortDescription="Stepping interval for the input"
+                      type="String" />
+        <cc:attribute name="value"
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <pre>
+            step = #{cc.attrs.step}
+            step = #{(not empty cc.attrs.step) ? cc.attrs.step : null}
+            step not empty? #{not empty cc.attrs.step}
+        </pre>
+        <div>
+            <div class="form-group">
+                <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+                <!--<cc:renderFacet name="input" />-->
+                <input aria-describedby="#{cc.attrs.inputId}-help"
+                       data-step="#{cc.attrs.step}"
+                       id="#{cc.attrs.inputId}"
+                       max="#{not empty cc.attrs.max ? cc.attrs.max : null}"
+                       min="#{not empty cc.attrs.min ? cc.attrs.min : null}"
+                       name="#{cc.attrs.name}"
+                       placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder : null}"
+                       required="#{cc.attrs.required ? 'required' : null}"
+                       step="#{cc.attrs.step}"
+                       type="number"
+                       value="#{not empty cc.attrs.value ? cc.attrs.value : null}" />
+                <small class="form-text text-muted"
+                       id="#{cc.attrs.inputId}-help">
+                    #{cc.attrs.help}
+                </small>
+            </div>
+
+        </div>
+    </cc:implementation>
+</html>
+
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
index 2f0cd4f8c..a25af17ba 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
-      xmlns="http://www.w3.org/1999/xhtml"
+<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:cc="http://xmlns.jcp.org/jsf/composite"
       xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -53,23 +53,24 @@
                       type="String" />
     </cc:interface>
     <cc:implementation>
-        <bootstrap:formGroup help="#{cc.attrs.help}"
-                             inputId="#{cc.attrs.inputId}"
-                             label="#{cc.attrs.label}">
-            <f:facet name="input">
-                <input aria-describedby="#{cc.attrs.inputId}-help"
-                       id="#{cc.attrs.inputId}"
-                       maxlength="#{(not empty cc.attrs.maxlength) ? cc.attrs.maxlength : null}"
-                       minlength="#{(not empty cc.attrs.minlength) ? cc.attrs.minlength : null}"
-                       name="#{cc.attrs.name}"
-                       pattern="#{not empty cc.attrs.pattern ? cc.attrs.pattern : null}"
-                       placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder: null}"
-                       required="#{cc.attrs.required ? 'required' : ''}"
-                       size="#{not empty cc.attrs.size ? cc.attrs.size : null}"
-                       value="#{not empty cc.attrs.value ? cc.attrs.value : ''}"
-                       type="text" />
-            </f:facet>
-        </bootstrap:formGroup>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   id="#{cc.attrs.inputId}"
+                   maxlength="#{(not empty cc.attrs.maxlength) ? cc.attrs.maxlength : null}"
+                   minlength="#{(not empty cc.attrs.minlength) ? cc.attrs.minlength : null}"
+                   name="#{cc.attrs.name}"
+                   pattern="#{not empty cc.attrs.pattern ? cc.attrs.pattern : null}"
+                   placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder: null}"
+                   required="#{cc.attrs.required ? 'required' : null}"
+                   size="#{not empty cc.attrs.size ? cc.attrs.size : null}"
+                   type="text" 
+                   value="#{not empty cc.attrs.value ? cc.attrs.value : ''}" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
     </cc:implementation>
 </html>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
index 5322ece0f..846ea9b5d 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
@@ -23,7 +23,14 @@
                     <bootstrap:formGroupText help="test"
                                              inputId="test"
                                              label="Test"
-                                             name="test" />
+                                             name="test"
+                                             value="foobar bar" />
+                    <bootstrap:formGroupNumber help="The price"
+                                               inputId="price"
+                                               label="Price"
+                                               name="price" 
+                                               step="0.01" 
+                                               value="10.0" />
                 </form>
                 <p>ToDo</p>
             </div>

From 24c02d587433ede1c5b5e9d29f019cf83ea43aad Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 18 Nov 2020 21:14:29 +0100
Subject: [PATCH 60/93] More form group components

---
 .../components/bootstrap/formGroupColor.xhtml | 48 +++++++++++
 .../components/bootstrap/formGroupDate.xhtml  | 60 ++++++++++++++
 .../components/bootstrap/formGroupEmail.xhtml | 82 ++++++++++++++++++
 .../components/bootstrap/formGroupFile.xhtml  | 69 +++++++++++++++
 .../bootstrap/formGroupNumber.xhtml           | 47 ++++-------
 .../bootstrap/formGroupPassword.xhtml         | 75 +++++++++++++++++
 .../components/bootstrap/formGroupRange.xhtml | 68 +++++++++++++++
 .../bootstrap/formGroupSearch.xhtml           | 74 +++++++++++++++++
 .../components/bootstrap/formGroupTel.xhtml   | 78 +++++++++++++++++
 .../components/bootstrap/formGroupText.xhtml  |  5 +-
 .../bootstrap/formGroupTextarea.xhtml         | 69 +++++++++++++++
 .../components/bootstrap/formGroupTime.xhtml  | 61 ++++++++++++++
 .../components/bootstrap/formGroupUrl.xhtml   | 83 +++++++++++++++++++
 .../ui/admin/categories/category-form.xhtml   | 74 +++++++++++++++--
 14 files changed, 854 insertions(+), 39 deletions(-)
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupColor.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupDate.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupEmail.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupFile.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupPassword.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRange.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSearch.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTel.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTextarea.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTime.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupUrl.xhtml

diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupColor.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupColor.xhtml
new file mode 100644
index 000000000..d03a66e42
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupColor.xhtml
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a form group with a number input">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server." 
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="value"
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   id="#{cc.attrs.inputId}"
+                   name="#{cc.attrs.name}"
+                   required="#{cc.attrs.required ? 'required' : null}"
+                   type="color"
+                   value="#{not empty cc.attrs.value ? cc.attrs.value : null}" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
+
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupDate.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupDate.xhtml
new file mode 100644
index 000000000..d4c920c1d
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupDate.xhtml
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a form grouo with an HTML date input field">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="max"
+                      required="false"
+                      shortDescription="The latest acceptable data"
+                      type="String" />
+        <cc:attribute name="min"
+                      required="false"
+                      shortDescription="The earlist acceptable data"
+                      type="String" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server." 
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="step"
+                      required="false"
+                      shortDescription="The stepping interval (in days)"
+                      type="int" />
+        <cc:attribute name="value"
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   id="#{cc.attrs.inputId}"
+                   max="#{cc.attrs.max}"
+                   min="#{cc.attrs.min}"
+                   name="#{cc.attrs.name}"
+                   step="#{cc.attrs.step}"
+                   type="date" 
+                   value="#{cc.attrs.value}" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupEmail.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupEmail.xhtml
new file mode 100644
index 000000000..00b0d5b92
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupEmail.xhtml
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a form group with a text input">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="maxlength" 
+                      required="false"
+                      shortDescription="Maximum length of the text in this field."
+                      type="int" />
+        <cc:attribute name="minlength" 
+                      required="false"
+                      shortDescription="Minium length of the text in this field."
+                      type="int" />
+        <cc:attribute default="false"
+                      name="multiple"
+                      required="false"
+                      shortDescription="Whether or not to allow multiple, comma-separated, e-mail addresses to be entered"
+                      type="boolean" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server."
+                      type="String" />
+        <cc:attribute name="pattern"
+                      required="false"
+                      shortDescription="A RegEx pattern that the value entered into this field must match"
+                      type="String" />
+        <cc:attribute name="placeholder"
+                      required="false"
+                      shortDescription="A placeholder to show in the empty field."
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="size"
+                      shortDescription="Length of the field. Can be overwritten using CSS."
+                      required="false"
+                      type="int" />
+        <cc:attribute name="value"
+                      default=""
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   id="#{cc.attrs.inputId}"
+                   maxlength="#{(not empty cc.attrs.maxlength) ? cc.attrs.maxlength : null}"
+                   minlength="#{(not empty cc.attrs.minlength) ? cc.attrs.minlength : null}"
+                   multiple="#{cc.attrs.multiple ? 'multiple' : null}"
+                   name="#{cc.attrs.name}"
+                   pattern="#{not empty cc.attrs.pattern ? cc.attrs.pattern : null}"
+                   placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder: null}"
+                   required="#{cc.attrs.required ? 'required' : null}"
+                   size="#{not empty cc.attrs.size ? cc.attrs.size : null}"
+                   type="email" 
+                   value="#{not empty cc.attrs.value ? cc.attrs.value : ''}" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
+
+
+
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupFile.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupFile.xhtml
new file mode 100644
index 000000000..f0984a644
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupFile.xhtml
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a form group with a number input">
+        <cc:attribute name="accept"
+                      required="false"
+                      shortDescription="One or more unique file type specifiers describing file types to allow"
+                      type="String" />
+        <cc:attribute name="capture"
+                      required="false"
+                      shortDescription="What source to use for capturing image or video data"
+                      type="String" />
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="max"
+                      required="false"
+                      shortDescription="Maximum allowed value."
+                      type="String" />
+        <cc:attribute name="min"
+                      required="false"
+                      shortDescription="Minimum allowed value."
+                      type="String" />
+        <cc:attribute default="false"
+                      name="multiple"
+                      required="false"
+                      shortDescription="A Boolean which, if present, indicates that the user may choose more than one file"
+                      type="boolean" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server." 
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input accept="#{not empty cc.attrs.accept ? cc.attrs.accept : null}"
+                   aria-describedby="#{cc.attrs.inputId}-help"
+                   capture="#{not empty cc.attrs.capture ? cc.attrs.capture : null}"
+                   id="#{cc.attrs.inputId}"
+                   max="#{not empty cc.attrs.max ? cc.attrs.max : null}"
+                   min="#{not empty cc.attrs.min ? cc.attrs.min : null}"
+                   multiple="#{cc.attrs.multiple ? cc.attrs.multiple : null}"
+                   name="#{cc.attrs.name}"
+                   required="#{cc.attrs.required ? 'required' : null}"
+                   type="file" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
+
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml
index ed31d82a2..693717010 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml
@@ -1,9 +1,6 @@
 <!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:cc="http://xmlns.jcp.org/jsf/composite"
-      xmlns:f="http://xmlns.jcp.org/jsf/core">
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
     <cc:interface shortDescription="Component for a form group with a number input">
         <cc:attribute name="help"
                       required="true"
@@ -48,32 +45,22 @@
                       type="String" />
     </cc:interface>
     <cc:implementation>
-        <pre>
-            step = #{cc.attrs.step}
-            step = #{(not empty cc.attrs.step) ? cc.attrs.step : null}
-            step not empty? #{not empty cc.attrs.step}
-        </pre>
-        <div>
-            <div class="form-group">
-                <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
-                <!--<cc:renderFacet name="input" />-->
-                <input aria-describedby="#{cc.attrs.inputId}-help"
-                       data-step="#{cc.attrs.step}"
-                       id="#{cc.attrs.inputId}"
-                       max="#{not empty cc.attrs.max ? cc.attrs.max : null}"
-                       min="#{not empty cc.attrs.min ? cc.attrs.min : null}"
-                       name="#{cc.attrs.name}"
-                       placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder : null}"
-                       required="#{cc.attrs.required ? 'required' : null}"
-                       step="#{cc.attrs.step}"
-                       type="number"
-                       value="#{not empty cc.attrs.value ? cc.attrs.value : null}" />
-                <small class="form-text text-muted"
-                       id="#{cc.attrs.inputId}-help">
-                    #{cc.attrs.help}
-                </small>
-            </div>
-
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   id="#{cc.attrs.inputId}"
+                   max="#{not empty cc.attrs.max ? cc.attrs.max : null}"
+                   min="#{not empty cc.attrs.min ? cc.attrs.min : null}"
+                   name="#{cc.attrs.name}"
+                   placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder : null}"
+                   required="#{cc.attrs.required ? 'required' : null}"
+                   step="#{cc.attrs.step}"
+                   type="number"
+                   value="#{not empty cc.attrs.value ? cc.attrs.value : null}" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
         </div>
     </cc:implementation>
 </html>
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupPassword.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupPassword.xhtml
new file mode 100644
index 000000000..ca9e387f8
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupPassword.xhtml
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a form group with a text input">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="maxlength" 
+                      required="false"
+                      shortDescription="Maximum length of the text in this field."
+                      type="int" />
+        <cc:attribute name="minlength" 
+                      required="false"
+                      shortDescription="Minium length of the text in this field."
+                      type="int" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server."
+                      type="String" />
+        <cc:attribute name="pattern"
+                      required="false"
+                      shortDescription="A RegEx pattern that the value entered into this field must match"
+                      type="String" />
+        <cc:attribute name="placeholder"
+                      required="false"
+                      shortDescription="A placeholder to show in the empty field."
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="size"
+                      shortDescription="Length of the field. Can be overwritten using CSS."
+                      required="false"
+                      type="int" />
+        <cc:attribute name="value"
+                      default=""
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   id="#{cc.attrs.inputId}"
+                   maxlength="#{(not empty cc.attrs.maxlength) ? cc.attrs.maxlength : null}"
+                   minlength="#{(not empty cc.attrs.minlength) ? cc.attrs.minlength : null}"
+                   name="#{cc.attrs.name}"
+                   pattern="#{not empty cc.attrs.pattern ? cc.attrs.pattern : null}"
+                   placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder: null}"
+                   required="#{cc.attrs.required ? 'required' : null}"
+                   size="#{not empty cc.attrs.size ? cc.attrs.size : null}"
+                   type="password" 
+                   value="#{not empty cc.attrs.value ? cc.attrs.value : ''}" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
+
+
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRange.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRange.xhtml
new file mode 100644
index 000000000..aec116750
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRange.xhtml
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a form group with a number input">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="max"
+                      required="false"
+                      shortDescription="Maximum allowed value."
+                      type="String" />
+        <cc:attribute name="min"
+                      required="false"
+                      shortDescription="Minimum allowed value."
+                      type="String" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server." 
+                      type="String" />
+        <cc:attribute name="placeholder"
+                      required="false"
+                      shortDescription="A placeholder to show in the empty field."
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="step"
+                      required="false"
+                      shortDescription="Stepping interval for the input"
+                      type="String" />
+        <cc:attribute name="value"
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   class="custom-range"
+                   id="#{cc.attrs.inputId}"
+                   max="#{not empty cc.attrs.max ? cc.attrs.max : null}"
+                   min="#{not empty cc.attrs.min ? cc.attrs.min : null}"
+                   name="#{cc.attrs.name}"
+                   placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder : null}"
+                   required="#{cc.attrs.required ? 'required' : null}"
+                   step="#{cc.attrs.step}"
+                   type="range"
+                   value="#{not empty cc.attrs.value ? cc.attrs.value : null}" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSearch.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSearch.xhtml
new file mode 100644
index 000000000..447e953bd
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSearch.xhtml
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a form group with a text input">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="maxlength" 
+                      required="false"
+                      shortDescription="Maximum length of the text in this field."
+                      type="int" />
+        <cc:attribute name="minlength" 
+                      required="false"
+                      shortDescription="Minium length of the text in this field."
+                      type="int" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server."
+                      type="String" />
+        <cc:attribute name="pattern"
+                      required="false"
+                      shortDescription="A RegEx pattern that the value entered into this field must match"
+                      type="String" />
+        <cc:attribute name="placeholder"
+                      required="false"
+                      shortDescription="A placeholder to show in the empty field."
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="size"
+                      shortDescription="Length of the field. Can be overwritten using CSS."
+                      required="false"
+                      type="int" />
+        <cc:attribute name="value"
+                      default=""
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   id="#{cc.attrs.inputId}"
+                   maxlength="#{(not empty cc.attrs.maxlength) ? cc.attrs.maxlength : null}"
+                   minlength="#{(not empty cc.attrs.minlength) ? cc.attrs.minlength : null}"
+                   name="#{cc.attrs.name}"
+                   pattern="#{not empty cc.attrs.pattern ? cc.attrs.pattern : null}"
+                   placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder: null}"
+                   required="#{cc.attrs.required ? 'required' : null}"
+                   size="#{not empty cc.attrs.size ? cc.attrs.size : null}"
+                   type="search" 
+                   value="#{not empty cc.attrs.value ? cc.attrs.value : ''}" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
+
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTel.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTel.xhtml
new file mode 100644
index 000000000..21c89fc3c
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTel.xhtml
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a form group with a text input">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="maxlength" 
+                      required="false"
+                      shortDescription="Maximum length of the text in this field."
+                      type="int" />
+        <cc:attribute name="minlength" 
+                      required="false"
+                      shortDescription="Minium length of the text in this field."
+                      type="int" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server."
+                      type="String" />
+        <cc:attribute name="pattern"
+                      required="false"
+                      shortDescription="A RegEx pattern that the value entered into this field must match"
+                      type="String" />
+        <cc:attribute name="placeholder"
+                      required="false"
+                      shortDescription="A placeholder to show in the empty field."
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="size"
+                      shortDescription="Length of the field. Can be overwritten using CSS."
+                      required="false"
+                      type="int" />
+        <cc:attribute name="value"
+                      default=""
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   id="#{cc.attrs.inputId}"
+                   maxlength="#{(not empty cc.attrs.maxlength) ? cc.attrs.maxlength : null}"
+                   minlength="#{(not empty cc.attrs.minlength) ? cc.attrs.minlength : null}"
+                   multiple="#{cc.attrs.multiple ? 'multiple' : null}"
+                   name="#{cc.attrs.name}"
+                   pattern="#{not empty cc.attrs.pattern ? cc.attrs.pattern : null}"
+                   placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder: null}"
+                   required="#{cc.attrs.required ? 'required' : null}"
+                   size="#{not empty cc.attrs.size ? cc.attrs.size : null}"
+                   type="tel" 
+                   value="#{not empty cc.attrs.value ? cc.attrs.value : ''}" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
+
+
+
+
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
index a25af17ba..ad68cfeca 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
@@ -1,9 +1,6 @@
 <!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:cc="http://xmlns.jcp.org/jsf/composite"
-      xmlns:f="http://xmlns.jcp.org/jsf/core">
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
     <cc:interface shortDescription="Component for a form group with a text input">
         <cc:attribute name="help"
                       required="true"
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTextarea.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTextarea.xhtml
new file mode 100644
index 000000000..5df333d2f
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTextarea.xhtml
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a form group with a number input">
+        <cc:attribute name="cols"
+                      required="false"
+                      shortDescription="The visible width of the text control, in average character widths. If it is specified, it must be a positive integer. If it is not specified, the default value is 20."
+                      type="int" />
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+         <cc:attribute name="maxlength" 
+                      required="false"
+                      shortDescription="Maximum length of the text in this field."
+                      type="int" />
+        <cc:attribute name="minlength" 
+                      required="false"
+                      shortDescription="Minium length of the text in this field."
+                      type="int" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server." 
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="rows"
+                      required="false"
+                      shortDescription="The number of visible text lines for the control."
+                      type="int" />
+        <cc:attribute name="value"
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+        <cc:attribute name="wrap"
+                      required="false"
+                      shortDescription="Indicates how the control wraps text."
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <textarea aria-describedby="#{cc.attrs.inputId}-help"
+                      cols="#{not empty cc.attrs.cols ? cc.attrs.cols : null}"
+                      id="#{cc.attrs.inputId}"
+                      maxlength="#{not empty cc.attrs.maxlength ? cc.attrs.maxlength : null}"
+                      minlength="#{not empty cc.attrs.minlength ? cc.attrs.maxlength : null}"
+                      name="#{cc.attrs.name}"
+                      rows="#{not empty cc.attrs.rows ? cc.attrs.rows : null}"
+                      wrap="#{not empty cc.attrs.wrap ? cc.attrs.wrap : null}">#{cc.attrs.value}</textarea>
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTime.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTime.xhtml
new file mode 100644
index 000000000..7c7907051
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTime.xhtml
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a form grouo with an HTML date input field">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="max"
+                      required="false"
+                      shortDescription="The latest time to accept."
+                      type="String" />
+        <cc:attribute name="min"
+                      required="false"
+                      shortDescription="The earliest time to accept as a valid input"
+                      type="String" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server." 
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="step"
+                      required="false"
+                      shortDescription="The stepping interval (in seconds)"
+                      type="int" />
+        <cc:attribute name="value"
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   id="#{cc.attrs.inputId}"
+                   max="#{cc.attrs.max}"
+                   min="#{cc.attrs.min}"
+                   name="#{cc.attrs.name}"
+                   step="#{cc.attrs.step}"
+                   type="time" 
+                   value="#{cc.attrs.value}" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupUrl.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupUrl.xhtml
new file mode 100644
index 000000000..8a5cbc55a
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupUrl.xhtml
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a form group with a text input">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="maxlength" 
+                      required="false"
+                      shortDescription="Maximum length of the text in this field."
+                      type="int" />
+        <cc:attribute name="minlength" 
+                      required="false"
+                      shortDescription="Minium length of the text in this field."
+                      type="int" />
+        <cc:attribute default="false"
+                      name="multiple"
+                      required="false"
+                      shortDescription="Whether or not to allow multiple, comma-separated, e-mail addresses to be entered"
+                      type="boolean" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server."
+                      type="String" />
+        <cc:attribute name="pattern"
+                      required="false"
+                      shortDescription="A RegEx pattern that the value entered into this field must match"
+                      type="String" />
+        <cc:attribute name="placeholder"
+                      required="false"
+                      shortDescription="A placeholder to show in the empty field."
+                      type="String" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="size"
+                      shortDescription="Length of the field. Can be overwritten using CSS."
+                      required="false"
+                      type="int" />
+        <cc:attribute name="value"
+                      default=""
+                      required="false"
+                      shortDescription="Value of the input field"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <input aria-describedby="#{cc.attrs.inputId}-help"
+                   id="#{cc.attrs.inputId}"
+                   maxlength="#{(not empty cc.attrs.maxlength) ? cc.attrs.maxlength : null}"
+                   minlength="#{(not empty cc.attrs.minlength) ? cc.attrs.minlength : null}"
+                   multiple="#{cc.attrs.multiple ? 'multiple' : null}"
+                   name="#{cc.attrs.name}"
+                   pattern="#{not empty cc.attrs.pattern ? cc.attrs.pattern : null}"
+                   placeholder="#{not empty cc.attrs.placeholder ? cc.attrs.placeholder: null}"
+                   required="#{cc.attrs.required ? 'required' : null}"
+                   size="#{not empty cc.attrs.size ? cc.attrs.size : null}"
+                   type="url" 
+                   value="#{not empty cc.attrs.value ? cc.attrs.value : ''}" />
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
+
+
+
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
index 846ea9b5d..39b376562 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
@@ -5,20 +5,20 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
-        
+
         <ui:param name="activePage" value="categories" />
         <ui:param name="title" value="#{AdminMessages['categories.label']}" />
-    
+
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item active">
                 #{AdminMessages['categories.label']}
             </li>
         </ui:define>
-        
+
         <ui:define name="main">
             <div class="container">
                 <h1>#{AdminMessages['categories.label']}</h1>
-                
+
                 <form action="#" method="post">
                     <bootstrap:formGroupText help="test"
                                              inputId="test"
@@ -31,10 +31,74 @@
                                                name="price" 
                                                step="0.01" 
                                                value="10.0" />
+                    <bootstrap:formGroupDate help="Test of date form group"
+                                             inputId="dateTest"
+                                             label="Date Test"
+                                             max="2020-11-30"
+                                             min="2020-11-02"
+                                             name="dateTest"
+                                             step="7"
+                                             value="2020-11-02" />
+                    <bootstrap:formGroupTime help="Test of date form group"
+                                             inputId="dateTest"
+                                             label="Date Test"
+                                             max="08:00"
+                                             min="18:00"
+                                             name="dateTest"
+                                             step="900"
+                                             value="08:00" />
+                    <bootstrap:formGroupSearch help="search test"
+                                               inputId="searchtest"
+                                               label="Search Test"
+                                               name="searchtest" 
+                                               placeholder="Search" />
+                    <bootstrap:formGroupPassword help="password test"
+                                                 inputId="passwordtest"
+                                                 label="Password Test"
+                                                 name="passwordtest" 
+                                                 placeholder="Password" />
+                    <bootstrap:formGroupEmail help="email test"
+                                              inputId="emailtest"
+                                              label="Email Test"
+                                              name="emailtest" 
+                                              placeholder="foo@example.com" />
+                    <bootstrap:formGroupTel help="Tel test"
+                                            inputId="teltest"
+                                            label="Tel Test"
+                                            name="teltest" 
+                                            placeholder="00000 00000" />
+                    <bootstrap:formGroupFile help="File test"
+                                             inputId="filetest"
+                                             label="File Test"
+                                             name="filetest"  />
+                    <bootstrap:formGroupUrl help="URL test"
+                                            inputId="urltest"
+                                            label="URL Test"
+                                            name="urltest" 
+                                            placeholder="https://www.example.org/foo/bar" />
+                    <bootstrap:formGroupColor help="Color Test"
+                                              inputId="colortest"
+                                              label="Color"
+                                              name="color" />
+                    <bootstrap:formGroupRange help="A range"
+                                              inputId="rangetest"
+                                              label="Range"
+                                              max="20"
+                                              min="5"
+                                              name="rangetest" 
+                                              step="0.1" 
+                                              value="10.0" />
+                    <bootstrap:formGroupTextarea cols="80"
+                                                 help="Textarea Test"
+                                                 label="Textarea"
+                                                 inputId="textareatest"
+                                                 name="textareatest"
+                                                 rows="10" />
+
                 </form>
                 <p>ToDo</p>
             </div>
         </ui:define>
-    
+
     </ui:composition>
 </html>

From c913118bd12e42aa185d621cb3bb94ca514abad8 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@goolemail.com>
Date: Thu, 19 Nov 2020 13:37:34 +0100
Subject: [PATCH 61/93] formGroup for select element

---
 .../categories/CategoryDetailsModel.java      | 23 ++++++
 .../bootstrap/formGroupSelect.xhtml           | 70 +++++++++++++++++++
 .../ui/admin/categories/category-form.xhtml   | 12 ++++
 3 files changed, 105 insertions(+)
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSelect.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
index 429684e0f..2823f73fa 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
@@ -23,9 +23,12 @@ import org.libreccm.ui.Message;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
@@ -118,6 +121,26 @@ public class CategoryDetailsModel {
         return categoryOrder;
     }
 
+    /**
+     * Only for testing components
+     * @return 
+     */
+    public Map<String, String> getOptions() {
+        final Map<String, String> options = new TreeMap<>();
+        options.put("alpha", "Option Alpha");
+        options.put("bravo", "Option Bravo");
+        options.put("charlie", "Option Charlie");
+        options.put("delta", "Option Delta");
+        options.put("echo", "Option Echo");
+        return options;
+    }
+    
+    public Set<String> getSelectedOptions() {
+        final Set<String> selectedOptions = new HashSet<>();
+        selectedOptions.add("delta");
+        return selectedOptions;
+    }
+    
     public List<Message> getMessages() {
         return Collections.unmodifiableList(messages);
     }
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSelect.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSelect.xhtml
new file mode 100644
index 000000000..92c5736b9
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSelect.xhtml
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+    <cc:interface shortDescription="Component for a form group with a number input">
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute default="false"
+                      name="multiple"
+                      required="false"
+                      shortDescription="Wether multiple options can be selected."
+                      type="boolean" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server." 
+                      type="String" />
+        <cc:attribute name="options"
+                      required="true"
+                      shortDescription="The options for the select as Map with Strings as key and value . The keys of the Map is used for the value attribute of the option elements, the values of the map are used as content of the option elements"
+                      type="java.util.Map" />
+        <cc:attribute default="false"
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute default="#{java.util.Collections.emptySet()}"
+                      name="selectedOptions"
+                      required="false"
+                      shortDescription="A collection of the keys of the selected options. The keys must be strings."
+                      type="java.util.Collection" />
+        <cc:attribute default="1"
+                      name="size"
+                      shortDescription="Size of the select element."
+                      required="false"
+                      type="int" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-group">
+            <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
+            <select aria-describedby="#{cc.attrs.inputId}-help"
+                    class="custom-select"
+                    id="#{cc.attrs.inputId}" 
+                    multiple="#{cc.attrs.multiple ? 'multiple' : null}"
+                    name="#{cc.attrs.name}"
+                    required="#{cc.attrs.required}"
+                    size="#{not empty cc.attrs.size ? cc.attrs.size : null}">
+                <c:forEach items="#{cc.attrs.options.entrySet()}" var="option">
+                    <option selected="#{cc.attrs.selectedOptions.contains(option.key) ? 'selected' : null}"
+                            value="#{option.key}">#{option.value}</option>
+                </c:forEach>
+            </select>
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </div>
+    </cc:implementation>
+</html>
+
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
index 39b376562..2fa9e306a 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
@@ -94,6 +94,18 @@
                                                  inputId="textareatest"
                                                  name="textareatest"
                                                  rows="10" />
+                    <bootstrap:formGroupSelect help="Select Test 1"
+                                               label="choose an option"
+                                               inputId="selecttest1"
+                                               name="selecttest1" 
+                                               options="#{CategoryDetailsModel.options}" />
+                    <bootstrap:formGroupSelect help="Select Test 2"
+                                               label="choose an option"
+                                               inputId="selecttest2"
+                                               name="selecttest2" 
+                                               options="#{CategoryDetailsModel.options}" 
+                                               selectedOptions="#{CategoryDetailsModel.selectedOptions}" 
+                                               size="3" />
 
                 </form>
                 <p>ToDo</p>

From 1c1f51ce6ac056611bf3be39a63331f986ddf2e7 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@goolemail.com>
Date: Thu, 19 Nov 2020 15:07:19 +0100
Subject: [PATCH 62/93] Components for single checkbox, checkbox group and
 radio group

---
 .../categories/CategoryDetailsModel.java      |  7 ++
 .../components/bootstrap/formCheck.xhtml      | 43 ++++++++++++
 .../bootstrap/formGroupChecks.xhtml           | 66 ++++++++++++++++++
 .../components/bootstrap/formGroupRadio.xhtml | 67 +++++++++++++++++++
 .../ui/admin/categories/category-form.xhtml   | 40 +++++++++++
 5 files changed, 223 insertions(+)
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupChecks.xhtml
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRadio.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
index 2823f73fa..e95901793 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
@@ -141,6 +141,13 @@ public class CategoryDetailsModel {
         return selectedOptions;
     }
     
+    public Set<String> getMultipleSelectedOptions() {
+        final Set<String> selectedOptions = new HashSet<>();
+        selectedOptions.add("delta");
+        selectedOptions.add("bravo");
+        return selectedOptions;
+    }
+    
     public List<Message> getMessages() {
         return Collections.unmodifiableList(messages);
     }
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml
new file mode 100644
index 000000000..540e02fe9
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite">
+    <cc:interface shortDescription="Component for a single checkbox">
+        <cc:attribute default="false"
+                      name="checked"
+                      shortDescription="Is the checkbox selected?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server." 
+                      type="String" />
+        <cc:attribute default="false" 
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute default="on"
+                      name="value"
+                      shortDescription="Value of the checkbox"
+                      required="false"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="form-check">
+            <input class="form-check-input" 
+                   id="#{cc.attrs.inputId}"
+                   name="#{cc.attrs.name}"
+                   type="checkbox"
+                   value="#{cc.attrs.value}" />
+            <label for="#{cc.attrs.inputId}">#{cc.attrs.label}</label>
+        </div>
+    </cc:implementation>
+</html>
\ No newline at end of file
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupChecks.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupChecks.xhtml
new file mode 100644
index 000000000..6828dce8c
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupChecks.xhtml
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+    <cc:interface shortDescription="Component for a single checkbox">
+        <cc:attribute default="false"
+                      name="checked"
+                      shortDescription="Is the checkbox selected?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server." 
+                      type="String" />
+        <cc:attribute name="options"
+                      required="true"
+                      shortDescription="The options for the select as Map with Strings as key and value . The keys of the Map is used for the value attribute of the option elements, the values of the map are used as content of the option elements"
+                      type="java.util.Map" />
+        <cc:attribute default="false" 
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute default="#{java.util.Collections.emptySet()}"
+                      name="selectedOptions"
+                      required="false"
+                      shortDescription="A collection of the keys of the selected options. The keys must be strings."
+                      type="java.util.Collection" />
+    </cc:interface>
+    <cc:implementation>
+        <fieldset aria-describedby="#{cc.attrs.inputId}-help" class="form-group">
+            <div class="row">
+                <legend class="col-form-label col-sm-2 pt-0">#{cc.attrs.label}</legend>
+                <div class="col-sm-10">
+                    <c:forEach items="#{cc.attrs.options.entrySet()}" var="option">
+                        <div class="form-check">
+                            <input checked="#{cc.attrs.selectedOptions.contains(option.key) ? 'checked' : null}"
+                                   class="form-check-input" 
+                                   id="#{cc.attrs.inputId}-#{option.key}"
+                                   name="#{cc.attrs.name}"
+                                   type="checkbox"
+                                   value="#{option.key}" />
+                            <label for="#{cc.attrs.inputId}-#{option.key}">#{option.value}</label>
+                        </div>
+                    </c:forEach>
+                </div>
+            </div>
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </fieldset>
+    </cc:implementation>
+</html>
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRadio.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRadio.xhtml
new file mode 100644
index 000000000..726371ec8
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRadio.xhtml
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+    <cc:interface shortDescription="Component for a single checkbox">
+        <cc:attribute default="false"
+                      name="checked"
+                      shortDescription="Is the checkbox selected?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute name="help"
+                      required="true"
+                      shortDescription="A short description of the input field"
+                      type="String" />
+        <cc:attribute name="inputId" 
+                      required="true" 
+                      shortDescription="The ID of the input field."
+                      type="String" />
+        <cc:attribute name="label"
+                      required="true"
+                      shortDescription="The label of the input field."
+                      type="String" />
+        <cc:attribute name="name" 
+                      required="true" 
+                      shortDescription="The name of the input field. This is also the name which is used to send the value of the input to the server." 
+                      type="String" />
+        <cc:attribute name="options"
+                      required="true"
+                      shortDescription="The options for the select as Map with Strings as key and value . The keys of the Map is used for the value attribute of the option elements, the values of the map are used as content of the option elements"
+                      type="java.util.Map" />
+        <cc:attribute default="false" 
+                      name="required"
+                      shortDescription="Is the field required?"
+                      required="false"
+                      type="boolean" />
+        <cc:attribute default="#{null}"
+                      name="selectedOption"
+                      required="false"
+                      shortDescription="The selected option"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <fieldset aria-describedby="#{cc.attrs.inputId}-help" class="form-group">
+            <div class="row">
+                <legend class="col-form-label col-sm-2 pt-0">#{cc.attrs.label}</legend>
+                <div class="col-sm-10">
+                    <c:forEach items="#{cc.attrs.options.entrySet()}" var="option">
+                        <div class="form-check">
+                            <input checked="#{option.key.equals(cc.attrs.selectedOption) ? 'checked' : null}"
+                                   class="form-check-input" 
+                                   id="#{cc.attrs.inputId}-#{option.key}"
+                                   name="#{cc.attrs.name}"
+                                   type="radio"
+                                   value="#{option.key}" />
+                            <label for="#{cc.attrs.inputId}-#{option.key}">#{option.value}</label>
+                        </div>
+                    </c:forEach>
+                </div>
+            </div>
+            <small class="form-text text-muted"
+                   id="#{cc.attrs.inputId}-help">
+                #{cc.attrs.help}
+            </small>
+        </fieldset>
+    </cc:implementation>
+</html>
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
index 2fa9e306a..f9c366b48 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
@@ -107,6 +107,46 @@
                                                selectedOptions="#{CategoryDetailsModel.selectedOptions}" 
                                                size="3" />
 
+                    <bootstrap:formGroupSelect help="Select Test 2"
+                                               label="choose an option"
+                                               inputId="selecttest2"
+                                               multiple="true"
+                                               name="selecttest2" 
+                                               options="#{CategoryDetailsModel.options}" 
+                                               selectedOptions="#{CategoryDetailsModel.multipleSelectedOptions}" 
+                                               size="3" />
+                    <bootstrap:formCheck label="Are you sure?"
+                                         inputId="checkboxtest1"
+                                         name="checkboxtest1" />
+                    <bootstrap:formGroupChecks help="Checkbox Test 1"
+                                               inputId="checkboxes1"
+                                               label="Checkboxes 1"
+                                               name="checkboxes1"
+                                               options="#{CategoryDetailsModel.options}" />
+                    <bootstrap:formGroupChecks help="Checkbox Test2 "
+                                               inputId="checkboxes2"
+                                               label="Checkboxes 2"
+                                               name="checkboxes2"
+                                               selectedOptions="#{CategoryDetailsModel.selectedOptions}"
+                                               options="#{CategoryDetailsModel.options}" />
+                    <bootstrap:formGroupChecks help="Checkbox Test 3"
+                                               inputId="checkboxes3"
+                                               label="Checkboxes 3"
+                                               name="checkboxes3"
+                                               selectedOptions="#{CategoryDetailsModel.multipleSelectedOptions}"
+                                               options="#{CategoryDetailsModel.options}" />
+                    
+                    <bootstrap:formGroupRadio help="Radio Test 1"
+                                               inputId="radio1"
+                                               label="Radio 1"
+                                               name="radio1"
+                                               options="#{CategoryDetailsModel.options}" />
+                    <bootstrap:formGroupRadio help="Radio Test 2 "
+                                               inputId="radios2"
+                                               label="Radio 2"
+                                               name="radio2"
+                                               selectedOption="charlie"
+                                               options="#{CategoryDetailsModel.options}" />
                 </form>
                 <p>ToDo</p>
             </div>

From 854ed35c61b830c01fc1bb197452094dca4659ce Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 19 Nov 2020 20:38:57 +0100
Subject: [PATCH 63/93] Component for delete dialog

---
 .../components/libreccm/deleteDialog.xhtml    | 123 ++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml

diff --git a/ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml
new file mode 100644
index 000000000..a84166be1
--- /dev/null
+++ b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml
@@ -0,0 +1,123 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:bootstrap="http://xmlns.jcp.org/jsf/composite/components/bootstrap"
+      xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+    <cc:interface shortDescription="A generic confirmation dialog for delete actions. The request is send by POST and contains a value confirmed=true">
+        <cc:attribute name="actionTarget"
+                      required="true"
+                      shortDescription="URL to POST request is send." />
+        <cc:attribute name="buttonText"
+                      required="true"
+                      shortDescription="Text pf the button toggleing the modal form."
+                      type="String" />
+        <cc:attribute name="buttonTextClass"
+                      default=""
+                      required="false"
+                      shortDescription="Class used for aligning the button. Either text-left, text-center or text-right."
+                      type="String" />
+        <cc:attribute name="cancelLabel"
+                      required="true"
+                      shortDescription="Label for the cancel button"
+                      type="String" />
+        <cc:attribute name="confirmLabel"
+                      required="true"
+                      shortDescription="Label for the confirm button"
+                      type="String" />
+        <cc:attribute name="dialogId"
+                      required="true"
+                      shortDescription="ID of the dialog."
+                      type="String" />
+        <cc:attribute name="dialogTitle"
+                      required="true"
+                      shortDescription="Title of the dialog."
+                      type="String" />
+        <cc:attribute name="headingLevel" 
+                      default="3" 
+                      required="false" 
+                      shortDescription="Level of the heading used for the component. Also determines the heading levels used for other parts of the component." 
+                      type="int" />
+        <cc:attribute name="message"
+                      required="true"
+                      shortDescription="Message to be shown in the dialog"
+                      type="String" />
+    </cc:interface>
+    <cc:implementation>
+        <div class="#{cc.attrs.buttonTextClass}">
+            <button
+                class="btn btn-danger"
+                data-target="##{cc.attrs.dialogId}"
+                data-toggle="modal"
+                type="button">
+                <c:if test="#{!cc.attrs.buttonIcon.isEmpty()}">
+                    <bootstrap:svgIcon icon="x-circle" />
+                </c:if>
+                <span>#{cc.attrs.buttonText}</span>
+            </button>
+        </div>
+        <div aria-labelledby="#{cc.attrs.dialogId}-title}"
+             aria-hidden="true"
+             class="modal fade"
+             data-backdrop="static"
+             id="#{cc.attrs.dialogId}"
+             tabindex="-1">
+            <div class="modal-dialog">
+                <form action="#{cc.attrs.actionTarget}"
+                      class="modal-content"
+                      method="post">
+                    <div class="modal-header">
+                        <div class="modal-title">
+                            <c:choose>
+                                <c:when test="#{cc.attrs.headingLevel == 1}">
+                                    <h2 class="modal-title"
+                                        id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h2>
+                                </c:when>
+                                <c:when test="#{cc.attrs.headingLevel == 2}">
+                                    <h3 class="modal-title"
+                                        id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h3>
+                                </c:when>
+                                <c:when test="#{cc.attrs.headingLevel == 3}">
+                                    <h4 class="modal-title"
+                                        id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h4>
+                                </c:when>
+                                <c:when test="#{cc.attrs.headingLevel == 4}">
+                                    <h5 class="modal-title"
+                                        id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h5>
+                                </c:when>
+                                <c:when test="#{cc.attrs.headingLevel == 5}">
+                                    <h6 class="modal-title"
+                                        id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h6>
+                                </c:when>
+                                <c:otherwise>
+                                    <div>#{cc.attrs.addDialogTitle}</div>
+                                </c:otherwise>
+                            </c:choose>
+                            <button aria-label="#{cc.attrs.addDialogCancelLabel}"
+                                    class="close" 
+                                    data-dismiss="modal" 
+                                    type="button"   >
+                                <span aria-hidden="true">&times;</span>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="modal-body">
+                        <p>
+                            #{cc.attrs.message}
+                        </p>
+                    </div>
+                    <div class="modal-footer">
+                        <button class="btn btn-secondary" 
+                                data-dismiss="modal"
+                                type="button" >
+                            #{cc.attrs.cancelLabel}
+                        </button>
+                        <button type="submit" class="btn btn-danger">
+                            #{cc.attrs.confirmLabel}
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </cc:implementation>
+</html>
+

From 4b6346e79a8832bb9dac6887c8e2b4b9f81325a3 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 19 Nov 2020 20:39:13 +0100
Subject: [PATCH 64/93] Views for managing categories

---
 .../categories/CategoryDetailsModel.java      |  79 +++---
 .../categories/CategoryFormController.java    |  26 +-
 .../admin/categories/CategoryNodeModel.java   |  53 +++-
 .../components/bootstrap/modalForm.xhtml      |  11 +-
 .../libreccm/localizedStringEditor.xhtml      |  15 +-
 .../categories/application-not-found.xhtml    |   6 +-
 .../admin/categories/category-details.xhtml   | 246 +++++++++++++++++-
 .../ui/admin/categories/category-form.xhtml   | 194 +++++---------
 .../admin/categories/category-not-found.xhtml |  20 +-
 .../categories/categorysystem-details.xhtml   |  27 +-
 .../categories/categorysystem-form.xhtml      |   7 +-
 .../categories/categorysystem-not-found.xhtml |   4 +-
 .../ui/admin/categories/categorysystems.xhtml |   6 +-
 .../org/libreccm/ui/AdminBundle.properties    |  41 ++-
 .../org/libreccm/ui/AdminBundle_de.properties |  41 ++-
 15 files changed, 534 insertions(+), 242 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
index e95901793..0aba4b14a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
@@ -19,6 +19,7 @@
 package org.libreccm.ui.admin.categories;
 
 import org.libreccm.categorization.Category;
+import org.libreccm.categorization.CategoryManager;
 import org.libreccm.ui.Message;
 
 import java.util.ArrayList;
@@ -28,10 +29,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.inject.Named;
 import javax.transaction.Transactional;
 
@@ -43,6 +44,9 @@ import javax.transaction.Transactional;
 @Named("CategoryDetailsModel")
 public class CategoryDetailsModel {
 
+    @Inject
+    private CategoryManager categoryManager;
+
     private long categoryId;
 
     private String uuid;
@@ -51,6 +55,8 @@ public class CategoryDetailsModel {
 
     private String name;
 
+    private String path;
+
     private Map<String, String> title;
 
     private Map<String, String> description;
@@ -69,6 +75,8 @@ public class CategoryDetailsModel {
 
     private final List<Message> messages;
 
+    private Set<String> invalidFields;
+
     public CategoryDetailsModel() {
         this.messages = new ArrayList<>();
     }
@@ -77,6 +85,10 @@ public class CategoryDetailsModel {
         return categoryId;
     }
 
+    public String getIdentifier() {
+        return String.format("ID-%d", categoryId);
+    }
+
     public String getUuid() {
         return uuid;
     }
@@ -89,6 +101,10 @@ public class CategoryDetailsModel {
         return name;
     }
 
+    public String getPath() {
+        return path;
+    }
+
     public Map<String, String> getTitle() {
         return Collections.unmodifiableMap(title);
     }
@@ -117,37 +133,18 @@ public class CategoryDetailsModel {
         return parentCategory;
     }
 
+    protected void setParentCategory(final Category parent) {
+        parentCategory = buildCategoryNodeModel(parent);
+    }
+
     public long getCategoryOrder() {
         return categoryOrder;
     }
 
-    /**
-     * Only for testing components
-     * @return 
-     */
-    public Map<String, String> getOptions() {
-        final Map<String, String> options = new TreeMap<>();
-        options.put("alpha", "Option Alpha");
-        options.put("bravo", "Option Bravo");
-        options.put("charlie", "Option Charlie");
-        options.put("delta", "Option Delta");
-        options.put("echo", "Option Echo");
-        return options;
+    public boolean isNew() {
+        return categoryId == 0;
     }
-    
-    public Set<String> getSelectedOptions() {
-        final Set<String> selectedOptions = new HashSet<>();
-        selectedOptions.add("delta");
-        return selectedOptions;
-    }
-    
-    public Set<String> getMultipleSelectedOptions() {
-        final Set<String> selectedOptions = new HashSet<>();
-        selectedOptions.add("delta");
-        selectedOptions.add("bravo");
-        return selectedOptions;
-    }
-    
+
     public List<Message> getMessages() {
         return Collections.unmodifiableList(messages);
     }
@@ -156,6 +153,18 @@ public class CategoryDetailsModel {
         messages.add(message);
     }
 
+    public Set<String> getInvalidFields() {
+        return Collections.unmodifiableSet(invalidFields);
+    }
+
+    protected void addInvalidField(final String invalidField) {
+        invalidFields.add(invalidField);
+    }
+
+    protected void setInvalidFields(final Set<String> invalidFields) {
+        this.invalidFields = new HashSet<>(invalidFields);
+    }
+
     @Transactional(Transactional.TxType.REQUIRED)
     protected void setCategory(final Category category) {
         Objects.requireNonNull(category);
@@ -164,6 +173,7 @@ public class CategoryDetailsModel {
         uuid = category.getUuid();
         uniqueId = category.getUniqueId();
         name = category.getName();
+        path = categoryManager.getCategoryPath(category);
         title = category
             .getTitle()
             .getValues()
@@ -192,11 +202,22 @@ public class CategoryDetailsModel {
         subCategories = category
             .getSubCategories()
             .stream()
-            .map(CategoryNodeModel::new)
+            .map(this::buildCategoryNodeModel)
             .sorted()
             .collect(Collectors.toList());
-        parentCategory = new CategoryNodeModel(category.getParentCategory());
+        parentCategory = buildCategoryNodeModel(category.getParentCategory());
         categoryOrder = category.getCategoryOrder();
     }
 
+    private CategoryNodeModel buildCategoryNodeModel(final Category category) {
+        final CategoryNodeModel model = new CategoryNodeModel();
+        model.setCategoryId(category.getObjectId());
+        model.setUuid(category.getUuid());
+        model.setUniqueId(category.getUniqueId());
+        model.setName(category.getName());
+        model.setPath(categoryManager.getCategoryPath(category));
+        model.setCategoryOrder(category.getCategoryOrder());
+        return model;
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
index e08d94e18..3ecaa31b8 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
@@ -76,23 +76,19 @@ public class CategoryFormController {
     private boolean enabled;
 
     @FormParam("visible")
-    private boolean visisble;
+    private boolean visible;
 
     @FormParam("abstractCategory")
     private boolean abstractCategory;
 
-    @FormParam("categoryOrder")
-    private long categoryOrder;
-
-    @FormParam("parentCategoryIdentifier")
-    private String parentCategoryIdentifier;
-
     @POST
-    @Path("/new")
+    @Path("/{parentCategoryIdentifier}/new")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
-    public String createCategory() {
+    public String createCategory(
+        @PathParam("parentCategoryIdentifier") final String parentCategoryIdentifier
+    ) {
         final Identifier parentIdentifier = identifierParser.parseIdentifier(
             parentCategoryIdentifier
         );
@@ -118,9 +114,8 @@ public class CategoryFormController {
             category.setUniqueId(uniqueId);
             category.setName(name);
             category.setEnabled(enabled);
-            category.setVisible(visisble);
+            category.setVisible(visible);
             category.setAbstractCategory(abstractCategory);
-            category.setCategoryOrder(categoryOrder);
 
             categoryRepository.save(category);
             categoryManager.addSubCategoryToCategory(category, parentCategory);
@@ -152,7 +147,7 @@ public class CategoryFormController {
         final String categoryIdentifierParam
     ) {
         final Identifier identifier = identifierParser.parseIdentifier(
-            parentCategoryIdentifier
+            categoryIdentifierParam
         );
         final Optional<Category> result;
         switch (identifier.getType()) {
@@ -175,12 +170,11 @@ public class CategoryFormController {
             category.setUniqueId(uniqueId);
             category.setName(name);
             category.setEnabled(enabled);
-            category.setVisible(visisble);
+            category.setVisible(visible);
             category.setAbstractCategory(abstractCategory);
-            category.setCategoryOrder(categoryOrder);
-            
+
             categoryRepository.save(category);
-            
+
             return String.format(
                 "redirect:categorymanager/categories/ID-%s",
                 category.getObjectId()
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
index d5776222e..f435f7a37 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
@@ -28,45 +28,70 @@ import java.util.Objects;
  */
 public class CategoryNodeModel implements Comparable<CategoryNodeModel> {
 
-    private final long categoryId;
+    private long categoryId;
 
-    private final String uuid;
+    private String uuid;
 
-    private final String uniqueId;
+    private String uniqueId;
 
-    private final String name;
+    private String name;
+    
+    private String path;
 
-    private final long categoryOrder;
-
-    public CategoryNodeModel(final Category category) {
-        Objects.requireNonNull(category);
-        categoryId = category.getObjectId();
-        uuid = category.getUuid();
-        uniqueId = category.getUniqueId();
-        categoryOrder = category.getCategoryOrder();
-        name = category.getName();
-    }
+    private long categoryOrder;
 
     public long getCategoryId() {
         return categoryId;
     }
 
+    protected void setCategoryId(final long categoryId) {
+        this.categoryId = categoryId;
+    }
+    
+    public String getIdentifier() {
+        return String.format("ID-%d", categoryId);
+    }
+    
     public String getUuid() {
         return uuid;
     }
+    
+    protected void setUuid(final String uuid) {
+        this.uuid = uuid;
+    }
 
     public String getUniqueId() {
         return uniqueId;
     }
+    
+    protected void setUniqueId(final String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
 
     public String getName() {
         return name;
     }
+    
+    protected void setName(final String name) {
+        this.name = name;
+    }
+    
+    public String getPath() {
+        return path;
+    }
+    
+    protected void setPath(final String path) {
+        this.path = path;
+    }
 
     public long getCategoryOrder() {
         return categoryOrder;
     }
 
+    protected void setCategoryOrder(final long categoryOrder) {
+        this.categoryOrder = categoryOrder;
+    }
+    
     @Override
     public int compareTo(final CategoryNodeModel other) {
         int result = Long.compare(
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/modalForm.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/modalForm.xhtml
index f4d918067..e62917ab6 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/modalForm.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/modalForm.xhtml
@@ -19,7 +19,7 @@
                       type="String" />
         <cc:attribute name="buttonText"
                       required="true"
-                      shortDescription="Text for the button toggleing the modal form."
+                      shortDescription="Text of the button toggleing the modal form."
                       type="String" />
         <cc:attribute name="buttonTextClass"
                       default=""
@@ -28,7 +28,7 @@
                       type="String" />
         <cc:attribute name="dialogId"
                       required="true"
-                      shortDescription="ID for the dialog."
+                      shortDescription="ID of the dialog."
                       type="String" />
         <cc:attribute name="method"
                       default="post"
@@ -41,8 +41,7 @@
     </cc:interface>
     <cc:implementation>
         <div class="#{cc.attrs.buttonTextClass}">
-            <button aria-labelledby="#{cc.attrs.dialogId}-title"
-                class="btn #{cc.attrs.buttonClass}"
+            <button class="btn #{cc.attrs.buttonClass}"
                     data-target="##{cc.attrs.dialogId}"
                     data-toggle="modal"
                     type="button">
@@ -52,7 +51,9 @@
                 <span>#{cc.attrs.buttonText}</span>
             </button>
         </div>
-        <div class="modal fade"
+        <div aria-labelledby="#{cc.attrs.dialogId}-title"
+             aria-hidden="true"
+             class="modal fade"
              data-backdrop="static"
              id="#{cc.attrs.dialogId}"
              tabindex="-1">
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml
index c2d96cc5d..be4483553 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml
@@ -213,19 +213,24 @@
                                 <div class="modal-header">
                                     <c:choose>
                                         <c:when test="#{cc.attrs.headingLevel == 1}">
-                                            <h2>#{cc.attrs.addDialogTitle}</h2>
+                                            <h2 class="modal-title"
+                                                id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h2>
                                         </c:when>
                                         <c:when test="#{cc.attrs.headingLevel == 2}">
-                                            <h3>#{cc.attrs.addDialogTitle}</h3>
+                                            <h3 class="modal-title"
+                                                id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h3>
                                         </c:when>
                                         <c:when test="#{cc.attrs.headingLevel == 3}">
-                                            <h4>#{cc.attrs.addDialogTitle}</h4>
+                                            <h4 class="modal-title"
+                                                id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h4>
                                         </c:when>
                                         <c:when test="#{cc.attrs.headingLevel == 4}">
-                                            <h5>#{cc.attrs.addDialogTitle}</h5>
+                                            <h5 class="modal-title"
+                                                id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h5>
                                         </c:when>
                                         <c:when test="#{cc.attrs.headingLevel == 5}">
-                                            <h6>#{cc.attrs.addDialogTitle}</h6>
+                                            <h6 class="modal-title"
+                                                id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h6>
                                         </c:when>
                                         <c:otherwise>
                                             <div>#{cc.attrs.addDialogTitle}</div>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/application-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/application-not-found.xhtml
index f828f658d..ce9fb3c87 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/application-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/application-not-found.xhtml
@@ -6,17 +6,17 @@
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
         
         <ui:param name="activePage" value="categories" />
-        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+        <ui:param name="title" value="#{AdminMessages['categorymanager.label']}" />
     
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item active">
-                #{AdminMessages['categories.label']}
+                #{AdminMessages['categorymanager.label']}
             </li>
         </ui:define>
         
         <ui:define name="main">
             <div class="container">
-                <h1>#{AdminMessages['categories.label']}</h1>
+                <h1>#{AdminMessages['categorymanager.label']}</h1>
                 <p>ToDo</p>
             </div>
         </ui:define>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
index f828f658d..c7110071d 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
@@ -1,25 +1,257 @@
 <!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:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
-        
+
         <ui:param name="activePage" value="categories" />
-        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
-    
+        <ui:param name="title" value="#{AdminMessages['categorymanager.label']}" />
+
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item active">
+                #{AdminMessages['categorymanager.label']}
+            </li>
+            <li class="breadcrumb-item">
                 #{AdminMessages['categories.label']}
             </li>
+            <li class="breadcrumb-item">
+                #{CategoryDetailsModel.categoryId}
+            </li>
         </ui:define>
-        
+
         <ui:define name="main">
             <div class="container">
-                <h1>#{AdminMessages['categories.label']}</h1>
-                <p>ToDo</p>
+                <h1>#{AdminMessages.getMessage('categories.details.title', [CategoryDetailsModel.path])}</h1>
+
+                <libreccm:messages messages="#{CategoryDetailsModel.messages}" />
+
+                <dl>
+                    <div>
+                        <dt>#{AdminMessages['categories.details.id']}</dt>
+                        <dd>#{CategoryDetailsModel.categoryId}</dd>
+                    </div>
+                    <div>
+                        <dt>#{AdminMessages['categories.details.uuid']}</dt>
+                        <dd>#{CategoryDetailsModel.uuid}</dd>
+                    </div>
+                    <div>
+                        <dt>#{AdminMessages['categories.details.uniqueId']}</dt>
+                        <dd>#{CategoryDetailsModel.uniqueId}</dd>
+                    </div>
+                    <div>
+                        <dt>#{AdminMessages['categories.details.name']}</dt>
+                        <dd>#{CategoryDetailsModel.name}</dd>
+                    </div>
+                    <div>
+                        <dt>#{AdminMessages['categories.details.enabled']}</dt>
+                        <dd>
+                            <c:choose>
+                                <c:when test="#{CategoryDetailsModel.enabled}">
+                                    #{AdminMessages['categories.details.enabled.yes']}
+                                </c:when>
+                                <c:otherwise>
+                                    #{AdminMessages['categories.details.enabled.no']}
+                                </c:otherwise>
+                            </c:choose>
+                        </dd>
+                    </div>
+                    <div>
+                        <dt>#{AdminMessages['categories.details.visible']}</dt>
+                        <dd>
+                            <c:choose>
+                                <c:when test="#{CategoryDetailsModel.enabled}">
+                                    #{AdminMessages['categories.details.visible.yes']}
+                                </c:when>
+                                <c:otherwise>
+                                    #{AdminMessages['categories.details.visible.no']}
+                                </c:otherwise>
+                            </c:choose>
+                        </dd>
+                    </div>
+                    <div>
+                        <dt>#{AdminMessages['categories.details.abstract_category']}</dt>
+                        <dd>
+                            <c:choose>
+                                <c:when test="#{CategoryDetailsModel.enabled}">
+                                    #{AdminMessages['categories.details.abstract_category.yes']}
+                                </c:when>
+                                <c:otherwise>
+                                    #{AdminMessages['categories.details.abstract_category.no']}
+                                </c:otherwise>
+                            </c:choose>
+                        </dd>
+                    </div>
+                </dl>
+
+                <div class="mb-4">
+                    <a class="btn btn-primary"
+                       href="#{mvc.uri('CategoriesController#editCategory', {'categoryIdentifier': CategoryDetailsModel.identifier } )}">
+                        <bootstrap:svgIcon icon="pen" />
+                        <span>#{AdminMessages['categories.details.edit']}</span>
+                    </a>
+                </div>
+
+                <libreccm:localizedStringEditor addMethod="CategoriesController#addTitle"
+                                                addButtonLabel="#{AdminMessages['categories.details.title.add']}"
+                                                addDialogCancelLabel="#{AdminMessages['categories.details.title.add.dialog.close']}"
+                                                addDialogLocaleSelectHelp="#{AdminMessages['categories.details.title.add.dialog.locale.help']}"
+                                                addDialogLocaleSelectLabel="#{AdminMessages['categories.details.title.add.dialog.locale.label']}"
+                                                addDialogSubmitLabel="#{AdminMessages['categories.details.title.add.dialog.submit']}"
+                                                addDialogTitle="#{AdminMessages['categories.details.title.add.dialog.title']}"
+                                                addDialogValueHelp="#{AdminMessages['categories.details.title.add.dialog.value.help']}"
+                                                addDialogValueLabel="#{AdminMessages['categories.details.title.add.dialog.value.label']}"
+                                                editButtonLabel="#{AdminMessages['categories.details.title.table.actions.edit']}"
+                                                editDialogCancelLabel="#{AdminMessages['categories.details.title.edit.dialog.close']}"
+                                                editDialogSubmitLabel="#{AdminMessages['categories.details.title.edit.dialog.submit']}"
+                                                editDialogTitle="#{AdminMessages['categories.details.title.table.actions.edit.dialog.title']}"
+                                                editDialogValueHelp="#{AdminMessages['categories.details.title.edit.dialog.value.help']}"
+                                                editDialogValueLabel="#{AdminMessages['categories.details.title.edit.dialog.value.label']}"
+                                                editMethod="CategoriesController#editTitle"
+                                                editorId="categorysystem-title"
+                                                emptyText="#{AdminMessages['categories.details.title.none']}"
+                                                hasUnusedLocales="#{CategorySystemDetailsModel.hasUnusedTitleLocales()}"
+                                                objectIdentifier="#{CategorySystemDetailsModel.identifier}"
+                                                removeButtonLabel="#{AdminMessages['categories.details.title.table.actions.remove']}"
+                                                removeDialogCancelLabel="#{AdminMessages['categories.details.title.remove.dialog.close']}"
+                                                removeDialogSubmitLabel="#{AdminMessages['categories.details.title.remove.dialog.submit']}"
+                                                removeDialogText="#{AdminMessages['categories.details.title.remove.dialog.message']}"
+                                                removeDialogTitle="#{AdminMessages['categories.details.title.table.actions.remove.dialog.title']}"
+                                                removeMethod="CategoriesController#removeTitle"
+                                                tableActionsHeading="#{AdminMessages['categories.details.title.table.headings.actions']}"
+                                                tableLocaleHeading="#{AdminMessages['categories.details.title.table.headings.locale']}"
+                                                tableValueHeading="#{AdminMessages['categories.details.title.table.headings.value']}"
+                                                title="#{AdminMessages['categories.details.title.heading']}"
+                                                unusedLocales="#{CategorySystemDetailsModel.unusedTitleLocales}"
+                                                values="#{CategorySystemDetailsModel.title}" />
+
+                <libreccm:localizedStringEditor addMethod="CategoriesController#addDescription"
+                                                addButtonLabel="#{AdminMessages['categories.details.description.add']}"
+                                                addDialogCancelLabel="#{AdminMessages['categories.details.description.add.dialog.close']}"
+                                                addDialogLocaleSelectHelp="#{AdminMessages['categories.details.description.add.dialog.locale.help']}"
+                                                addDialogLocaleSelectLabel=" #{AdminMessages['categories.details.description.add.dialog.locale.label']}"
+                                                addDialogSubmitLabel="#{AdminMessages['categories.details.description.add.dialog.submit']}"
+                                                addDialogTitle="#{AdminMessages['categories.details.description.add.dialog.title']}"
+                                                addDialogValueHelp="#{AdminMessages['categories.details.description.add.dialog.value.help']}"
+                                                addDialogValueLabel="#{AdminMessages['categories.details.description.add.dialog.value.label']}"
+                                                editButtonLabel="#{AdminMessages['categories.details.description.table.actions.edit']}"
+                                                editDialogCancelLabel="#{AdminMessages['categories.details.description.edit.dialog.close']}"
+                                                editDialogSubmitLabel="#{AdminMessages['categories.details.description.edit.dialog.submit']}"
+                                                editDialogTitle="#{AdminMessages['categories.details.description.table.actions.edit.dialog.title']}"
+                                                editDialogValueHelp="#{AdminMessages['categories.details.description.edit.dialog.value.help']}"
+                                                editDialogValueLabel="#{AdminMessages['categories.details.description.edit.dialog.value.label']}"
+                                                editMethod="CategoriesController#editDescription"
+                                                editorId="categorysystem-description"
+                                                emptyText="#{AdminMessages['categories.details.description.none']}"
+                                                hasUnusedLocales="#{CategorySystemDetailsModel.hasUnusedDescriptionLocales()}"
+                                                objectIdentifier="#{CategorySystemDetailsModel.identifier}"
+                                                removeButtonLabel="#{AdminMessages['categories.details.description.table.actions.remove']}"
+                                                removeDialogCancelLabel="#{AdminMessages['categories.details.description.remove.dialog.close']}"
+                                                removeDialogSubmitLabel="#{AdminMessages['categories.details.description.remove.dialog.submit']}"
+                                                removeDialogText="#{AdminMessages['categories.details.description.remove.dialog.message']}"
+                                                removeDialogTitle="#{AdminMessages['categories.details.description.table.actions.remove.dialog.title']}"
+                                                removeMethod="CategoriesController#removeDescription"
+                                                tableActionsHeading="#{AdminMessages['categories.details.description.table.headings.actions']}"
+                                                tableLocaleHeading="#{AdminMessages['categories.details.description.table.headings.locale']}"
+                                                tableValueHeading="#{AdminMessages['categories.details.description.table.headings.value']}"
+                                                title="#{AdminMessages['categories.details.description.heading']}"
+                                                unusedLocales="#{CategorySystemDetailsModel.unusedTitleLocales}"
+                                                useTextarea="true"
+                                                values="#{CategorySystemDetailsModel.description}" />
+
+                <h2>#{AdminMessages['categories.details.subcategories.heading']}</h2>
+                <div class="mb-2">
+                    <div class="text-right">
+                        <a class="btn btn-secondary"
+                           href="#{mvc.uri('CategoriesController#newSubCategory', {'categoryIdentifier': CategorySystemDetailsModel.parentIdentifier})}">
+                            <bootstrap:svgIcon icon="plus-circle" />
+                            <span>#{AdminMessages['categories.details.subcategories.add']}</span>
+                        </a>
+                    </div>
+                </div>
+                <c:choose>
+                    <c:when test="#{CategoryDetailsModel.subCategories.isEmpty()}">
+                        <p>#{AdminMessages['categories.details.subcategories.none']}</p>
+                    </c:when>
+                    <c:otherwise>
+                        <table class="table table-hover">
+                            <thead>
+                                <tr>
+                                    <th scope="col">
+                                        #{AdminMessages['categories.details.subcategories.table.headings.name']}
+                                    </th>
+                                    <th>
+                                        #{AdminMessages['categories.details.subcategories.table.headings.enabled']}
+                                    </th>
+                                    <th>
+                                        #{AdminMessages['categories.details.subcategories.table.headings.visible']}
+                                    </th>
+                                    <th>
+                                        #{AdminMessages['categories.details.subcategories.table.headings.abstract']}
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <c:forEach items="#{CategoryDetailsModel.subCategories}" 
+                                           var="category">
+                                    <tr>
+                                        <td>
+                                            <a href="#{mvc.uri('CategoriesController#getCategory', { 'categoryIdentifier': category.identifier})}">
+                                                #{category.name}
+                                            </a>
+                                        </td>
+                                        <td>
+                                            <c:choose>
+                                                <c:when test="#{category.enabled}">
+                                                    #{AdminMessages['categories.details.enabled.yes']}
+                                                </c:when>
+                                                <c:otherwise>
+                                                    #{AdminMessages['categories.details.enabled.no']}
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </td>
+                                        <td>
+                                            <c:choose>
+                                                <c:when test="#{category.visible}">
+                                                    #{AdminMessages['categories.details.visible.yes']}
+                                                </c:when>
+                                                <c:otherwise>
+                                                    #{AdminMessages['categories.details.visible.no']}
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </td>
+                                        <td>
+                                            <c:choose>
+                                                <c:when test="#{category.abstractCategory}">
+                                                    #{AdminMessages['categories.details.abstract_category.yes']}
+                                                </c:when>
+                                                <c:otherwise>
+                                                    #{AdminMessages['categories.details.abstract_category.no']}
+                                                </c:otherwise>
+                                            </c:choose>
+                                        </td>
+                                        <td>
+                                            <libreccm:deleteDialog 
+                                                actionTarget="#{mvc.uri('CategoriesController#removeSubCategory', {'categoryIdentifier': category.identifier})}"
+                                                buttonText="#{AdminMeesages['categories.details.subcategories.delete']}"
+                                                buttonTextClass="text-center"
+                                                cancelLabel="#{AdminMessages['categories.details.subcategories.delete.cancel']}"
+                                                confirmLabel="#{AdminMessages['categories.details.subcategories.delete.confirm']}"
+                                                dialogId="categories-subcategories-#{category.categoryId}-delete"
+                                                dialogTitle="#{AdminMessages['categories.details.subcategories.delete.title']}"
+                                                message="#{AdminMessages.getMessage('categories.details.subcategories.delete.message', [category.path])}"
+                                                />
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </tbody>
+                    </c:otherwise>
+                </c:choose>
+
             </div>
         </ui:define>
-    
+
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
index f9c366b48..018cfade2 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
@@ -7,148 +7,80 @@
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
         <ui:param name="activePage" value="categories" />
-        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+        <ui:param name="title" value="#{AdminMessages['categorymanager.label']}" />
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item active">
+                #{AdminMessages['categorymanager.label']}
+            </li>
+            <li class="breadcrumb-item">
                 #{AdminMessages['categories.label']}
             </li>
+            <c:choose>
+                <c:when test="#{CategoryDetailsModel.new}">
+                    <li class="breadcrumb-item active">
+                        #{AdminMessages['categories.new.breadcrumb']}
+                    </li>
+                </c:when>
+                <c:otherwise>
+                    <li class="breadcrumb-item active">
+                        #{AdminMessages.getMessage('categories.edit.breadcrumb', CategoryDetailsModel.name)}
+                    </li>
+                </c:otherwise>
+            </c:choose>
         </ui:define>
 
         <ui:define name="main">
             <div class="container">
-                <h1>#{AdminMessages['categories.label']}</h1>
+                <h1>
+                    <c:choose>
+                        <c:when test="#{CategoryDetailsModel.new}">
+                            #{AdminMessage.getMessage('categories.new.label', CategoryDetailsModel.parent.path)}
+                        </c:when>
+                        <c:otherwise>
+                            #{AdminMessage.getMessage('categories.edit.label', CategoryDetailsModel.path)}
+                        </c:otherwise>
+                    </c:choose>
+                    #{AdminMessages['categories.label']}
+                </h1>
 
-                <form action="#" method="post">
-                    <bootstrap:formGroupText help="test"
-                                             inputId="test"
-                                             label="Test"
-                                             name="test"
-                                             value="foobar bar" />
-                    <bootstrap:formGroupNumber help="The price"
-                                               inputId="price"
-                                               label="Price"
-                                               name="price" 
-                                               step="0.01" 
-                                               value="10.0" />
-                    <bootstrap:formGroupDate help="Test of date form group"
-                                             inputId="dateTest"
-                                             label="Date Test"
-                                             max="2020-11-30"
-                                             min="2020-11-02"
-                                             name="dateTest"
-                                             step="7"
-                                             value="2020-11-02" />
-                    <bootstrap:formGroupTime help="Test of date form group"
-                                             inputId="dateTest"
-                                             label="Date Test"
-                                             max="08:00"
-                                             min="18:00"
-                                             name="dateTest"
-                                             step="900"
-                                             value="08:00" />
-                    <bootstrap:formGroupSearch help="search test"
-                                               inputId="searchtest"
-                                               label="Search Test"
-                                               name="searchtest" 
-                                               placeholder="Search" />
-                    <bootstrap:formGroupPassword help="password test"
-                                                 inputId="passwordtest"
-                                                 label="Password Test"
-                                                 name="passwordtest" 
-                                                 placeholder="Password" />
-                    <bootstrap:formGroupEmail help="email test"
-                                              inputId="emailtest"
-                                              label="Email Test"
-                                              name="emailtest" 
-                                              placeholder="foo@example.com" />
-                    <bootstrap:formGroupTel help="Tel test"
-                                            inputId="teltest"
-                                            label="Tel Test"
-                                            name="teltest" 
-                                            placeholder="00000 00000" />
-                    <bootstrap:formGroupFile help="File test"
-                                             inputId="filetest"
-                                             label="File Test"
-                                             name="filetest"  />
-                    <bootstrap:formGroupUrl help="URL test"
-                                            inputId="urltest"
-                                            label="URL Test"
-                                            name="urltest" 
-                                            placeholder="https://www.example.org/foo/bar" />
-                    <bootstrap:formGroupColor help="Color Test"
-                                              inputId="colortest"
-                                              label="Color"
-                                              name="color" />
-                    <bootstrap:formGroupRange help="A range"
-                                              inputId="rangetest"
-                                              label="Range"
-                                              max="20"
-                                              min="5"
-                                              name="rangetest" 
-                                              step="0.1" 
-                                              value="10.0" />
-                    <bootstrap:formGroupTextarea cols="80"
-                                                 help="Textarea Test"
-                                                 label="Textarea"
-                                                 inputId="textareatest"
-                                                 name="textareatest"
-                                                 rows="10" />
-                    <bootstrap:formGroupSelect help="Select Test 1"
-                                               label="choose an option"
-                                               inputId="selecttest1"
-                                               name="selecttest1" 
-                                               options="#{CategoryDetailsModel.options}" />
-                    <bootstrap:formGroupSelect help="Select Test 2"
-                                               label="choose an option"
-                                               inputId="selecttest2"
-                                               name="selecttest2" 
-                                               options="#{CategoryDetailsModel.options}" 
-                                               selectedOptions="#{CategoryDetailsModel.selectedOptions}" 
-                                               size="3" />
-
-                    <bootstrap:formGroupSelect help="Select Test 2"
-                                               label="choose an option"
-                                               inputId="selecttest2"
-                                               multiple="true"
-                                               name="selecttest2" 
-                                               options="#{CategoryDetailsModel.options}" 
-                                               selectedOptions="#{CategoryDetailsModel.multipleSelectedOptions}" 
-                                               size="3" />
-                    <bootstrap:formCheck label="Are you sure?"
-                                         inputId="checkboxtest1"
-                                         name="checkboxtest1" />
-                    <bootstrap:formGroupChecks help="Checkbox Test 1"
-                                               inputId="checkboxes1"
-                                               label="Checkboxes 1"
-                                               name="checkboxes1"
-                                               options="#{CategoryDetailsModel.options}" />
-                    <bootstrap:formGroupChecks help="Checkbox Test2 "
-                                               inputId="checkboxes2"
-                                               label="Checkboxes 2"
-                                               name="checkboxes2"
-                                               selectedOptions="#{CategoryDetailsModel.selectedOptions}"
-                                               options="#{CategoryDetailsModel.options}" />
-                    <bootstrap:formGroupChecks help="Checkbox Test 3"
-                                               inputId="checkboxes3"
-                                               label="Checkboxes 3"
-                                               name="checkboxes3"
-                                               selectedOptions="#{CategoryDetailsModel.multipleSelectedOptions}"
-                                               options="#{CategoryDetailsModel.options}" />
-                    
-                    <bootstrap:formGroupRadio help="Radio Test 1"
-                                               inputId="radio1"
-                                               label="Radio 1"
-                                               name="radio1"
-                                               options="#{CategoryDetailsModel.options}" />
-                    <bootstrap:formGroupRadio help="Radio Test 2 "
-                                               inputId="radios2"
-                                               label="Radio 2"
-                                               name="radio2"
-                                               selectedOption="charlie"
-                                               options="#{CategoryDetailsModel.options}" />
+                <form action="#{CategoryDetailsModel.new ? mvc.uri('CategoryFormController#createCategory', {'parentCategoryIdentifier', CategoryDetailsModel.parentCategory.identifier }) : mvc.uri('CategoryFormController#updateCategory', {'categoryIdentifier', CategoryDetailsModel.identifier })}" 
+                      method="post">
+                    <bootstrap:formGroupText help="#{AdminMessages['categories.form.name.help']}" 
+                                             inputId="name" 
+                                             label="#{AdminMessages['categories.form.name.label']}" 
+                                             name="name" 
+                                             pattern="[\\w-.]*"
+                                             required="true" />
+                    <bootstrap:formGroupText help="#{AdminMessages['categories.form.uniqueId.help']}" 
+                                             inputId="uniqueId" 
+                                             label="#{AdminMessages['categories.form.uniqueId.label']}" 
+                                             name="uniqueId" 
+                                             required="false" />
+                    <bootstrap:formCheck label="#{AdminMessages['categories.form.enabled.label']}"
+                                         inputId="enabled"
+                                         name="enabled" />
+                    <bootstrap:formCheck label="#{AdminMessages['categories.form.visible.label']}"
+                                         inputId="visible"
+                                         name="visible" />
+                    <bootstrap:formCheck label="#{AdminMessages['categories.form.abstractCategory.label']}"
+                                         inputId="abstractCategory"
+                                         name="abstractCategory" />
+                    <a class="btn btn-warning" 
+                       href="#{mvc.uri('CategorySystemsController#getCategorySystems')}">
+                        #{AdminMessages['categories.form.buttons.cancel']}
+                    </a>
+                    <button class="btn btn-success" type="submit">
+                        <c:choose>
+                            <c:when test="#{CategorySystemDetailsModel.new}">
+                                #{AdminMessages['categories.form.buttons.create']}
+                            </c:when>
+                            <c:otherwise>
+                                #{AdminMessages['categories.form.buttons.save']}
+                            </c:otherwise>
+                        </c:choose>
+                    </button>
                 </form>
-                <p>ToDo</p>
             </div>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-not-found.xhtml
index f828f658d..464da85f7 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-not-found.xhtml
@@ -4,22 +4,26 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
-        
+
         <ui:param name="activePage" value="categories" />
-        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
-    
+        <ui:param name="title" value="#{AdminMessages['categorymanager.label']}" />
+
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item active">
-                #{AdminMessages['categories.label']}
+                #{AdminMessages['categorymanager.label']}
             </li>
         </ui:define>
-        
+
         <ui:define name="main">
             <div class="container">
-                <h1>#{AdminMessages['categories.label']}</h1>
-                <p>ToDo</p>
+                <h1>#{AdminMessages['categories.not_found.title']}</h1>
+                <c:forEach items="#{CategoryDetailsModel.messages}" var="message">
+                    <div class="alert alert-#{message.messageType}" role="alert">
+                        #{message}
+                    </div>
+                </c:forEach>
             </div>
         </ui:define>
-    
+
     </ui:composition>
 </html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index 7237d8541..6c4c26824 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -9,12 +9,12 @@
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
         <ui:param name="activePage" value="categories" />
-        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+        <ui:param name="title" value="#{AdminMessages['categorymanager.label']}" />
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item">
                 <a href="#{mvc.uri('CategorySystemsController#getCategorySystems')}">
-                    #{AdminMessages['categories.label']}
+                    #{AdminMessages['categorymanager.label']}
                 </a>
             </li>
             <li class="breadcrumb-item active">
@@ -308,8 +308,7 @@
                 <div class="mb-2">
                     <div class="text-right">
                         <a class="btn btn-secondary"
-                           href="#{mvc.uri('CategoriesController#newSubCategory', {'categoryIdentifier': CategorySystemDetailsModel.rootIdentifier})}"
-                           type="button">
+                           href="#{mvc.uri('CategoriesController#newSubCategory', {'categoryIdentifier': CategorySystemDetailsModel.rootIdentifier})}">
                             <bootstrap:svgIcon icon="plus-circle" />
                             <span>#{AdminMessages['categorysystems.details.categories.add']}</span>
                         </a>
@@ -378,15 +377,17 @@
                                                 </c:otherwise>
                                             </c:choose>
                                         </td>
-                                        <td class="text-center">
-                                            <button class="btn btn-danger"
-                                                    data-target="#categorysystem-categories-#{category.uuid}-delete"
-                                                    data-toggle="modal"
-                                                    type="button">
-                                                <bootstrap:svgIcon icon="x-circle" />
-                                                <span>#{AdminMessages['categorysystems.details.categories.delete']}</span>
-                                            </button>
-                                            <!-- ToDo: Delete Dialog -->
+                                        <td>
+                                            <libreccm:deleteDialog 
+                                                actionTarget="#{mvc.uri('CategoriesController#removeSubCategory', {'categoryIdentifier': category.identifier})}"
+                                                buttonText="#{AdminMeesages['categories.details.subcategories.delete']}"
+                                                buttonTextClass="text-center"
+                                                cancelLabel="#{AdminMessages['categories.details.subcategories.delete.cancel']}"
+                                                confirmLabel="#{AdminMessages['categories.details.subcategories.delete.confirm']}"
+                                                dialogId="categories-subcategories-#{category.categoryId}-delete"
+                                                dialogTitle="#{AdminMessages['categories.details.subcategories.delete.title']}"
+                                                message="#{AdminMessages.getMessage('categories.details.subcategories.delete.message', [category.path])}"
+                                                />
                                         </td>
                                     </tr>
                                 </c:forEach>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
index 78db188a8..ac09993f9 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-form.xhtml
@@ -6,13 +6,13 @@
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
         <ui:param name="activePage" value="categories" />
-        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+        <ui:param name="title" value="#{AdminMessages['categorymanager.label']}" />
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item active">
-                #{AdminMessages['categories.label']}
+                #{AdminMessages['categorymanager.label']}
             </li>
-            <li class="breadcrumb-item active">
+            <li class="breadcrumb-item">
                 <a href="#{mvc.uri('CategorySystemsController#getCategorySystems')}">
                     #{AdminMessages['categorysystems.label']}
                 </a>
@@ -29,7 +29,6 @@
                     </li>
                 </c:otherwise>
             </c:choose>
-
         </ui:define>
 
         <ui:define name="main">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml
index da2bdcdc1..bd26588e4 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-not-found.xhtml
@@ -6,11 +6,11 @@
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
         <ui:param name="activePage" value="categories" />
-        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+        <ui:param name="title" value="#{AdminMessages['categorymanager.label']}" />
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item active">
-                #{AdminMessages['categories.label']}
+                #{AdminMessages['categorymanager.label']}
             </li>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
index 6df5addce..8b3514435 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
@@ -7,14 +7,14 @@
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
         <ui:param name="activePage" value="categories" />
-        <ui:param name="title" value="#{AdminMessages['categories.label']}" />
+        <ui:param name="title" value="#{AdminMessages['categorymanager.label']}" />
 
         <ui:define name="breadcrumb">
             <li class="breadcrumb-item active">
-                #{AdminMessages['categories.label']}
+                #{AdminMessages['categorymanager.label']}
             </li>
             <li class="breadcrumb-item active">
-                #{AdminMessages['categories.label']}
+                #{AdminMessages['categorymanager.label']}
             </li>
             <li class="breadcrumb-item active">
                 #{AdminMessages['categorysystems.label']}
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 84b772845..238be46aa 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -3,7 +3,7 @@ systeminformation.label=System Information
 applications.label=Applications
 applications.description=Manage application instances
 imexport.label=Import/Export
-categories.label=Categories Manager
+categorymanager.label=Categories Manager
 categories.description=Manage categories
 configuration.label=Configuration
 configuration.description=Manage configuration settings
@@ -358,3 +358,42 @@ categorysystems.details.categories.table.headings.visible.false=No
 categorysystems.details.categories.table.headings.abstract.true=Yes
 categorysystems.details.categories.table.headings.abstract.false=No
 categorysystems.details.categories.delete=Delete
+categories.label=Categories
+categories.new.label=Create new subcategory of category {0}
+categories.edit.label=Edit category {0}
+categories.new.breadcrumb=Create new category
+categories.edit.breadcrumb=Edit category {0}
+categories.form.uniqueId.help=Unique ID of the new category. Should be unique for the complete category system
+categories.form.uniqueId.label=Unique ID
+categories.form.name.help=Name of the category. May only contain the letters, numbers and hypens.
+categories.form.name.label=Name
+categories.form.enabled.label=Enabled?
+categories.form.visible.label=Visible?
+categories.form.abstractCategory.label=Abstract Category?
+categories.form.buttons.create=Create new category
+categories.form.buttons.save=Save
+categories.form.buttons.cancel=Cancel
+categories.not_found.title=Category not found
+categories.details.title=Details of category {0}
+categories.details.edit=Edit
+categories.details.enabled.yes=Yes
+categories.details.enabled.no=No
+categories.details.visible.yes=Yes
+categories.details.visible.no=No
+categories.details.abstract_category.yes=Yes
+categories.details.abstract_category.no=No
+categories.details.enabled=Enabled?
+categories.details.visible=Visible?
+categories.details.abstract_category=Abstract Category?
+categories.details.subcategories.heading=Subcategories
+categories.details.subcategories.add=Add new subcategory
+categories.details.subcategories.none=This category has no subcategories
+categories.details.subcategories.table.headings.name=Name
+categories.details.subcategories.table.headings.enabled=Enabled?
+categories.details.subcategories.table.headings.visible=Visible?
+categories.details.subcategories.table.headings.abstract=Abstract?
+categories.details.subcategories.delete=Delete
+categories.details.subcategories.delete.cancel=Cancel
+categories.details.subcategories.delete.confirm=Delete category
+categories.details.subcategories.delete.title=Delete category?
+categories.details.subcategories.delete.message=Are you sure to delete category {0}?
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 893282d4c..a5e561e4a 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -3,7 +3,7 @@ systeminformation.label=System Informationen
 applications.label=Anwendungen
 applications.description=Verwalten der Anwendungsinstanzen
 imexport.label=Import/Export
-categories.label=Kategorienmanager
+categorymanager.label=Kategorienmanager
 categories.description=Verwaltung der Kategorien
 configuration.label=Konfiguration
 configuration.description=Bearbeiten der Konfiguration
@@ -358,3 +358,42 @@ categorysystems.details.categories.table.headings.visible.false=Nein
 categorysystems.details.categories.table.headings.abstract.true=Ja
 categorysystems.details.categories.table.headings.abstract.false=Nein
 categorysystems.details.categories.delete=L\u00f6schen
+categories.label=Kategorien
+categories.new.label=Neue Unterkategorie f\u00fcr Kategorie {0} erstellen
+categories.edit.label=Kategorie {0} bearbeiten
+categories.new.breadcrumb=Neue Kategorie anlegen
+categories.edit.breadcrumb=Kategorie {0} bearbeiten
+categories.form.uniqueId.help=Eindeutige ID der Kategorie. Sollte innerhalb des gesamten Kategoriensystems eindeutig sein.
+categories.form.uniqueId.label=Eindeutige ID
+categories.form.name.help=Name der Kategorie. Darf nur Buchstaben, Zahlen und den Bindestrich enthalten.
+categories.form.name.label=Name
+categories.form.enabled.label=Aktiv?
+categories.form.visible.label=Sichtbar?
+categories.form.abstractCategory.label=Abstrakte Kategorie?
+categories.form.buttons.create=Neue Kategorie anlegen
+categories.form.buttons.save=Speichern
+categories.form.buttons.cancel=Abbrechen
+categories.not_found.title=Kategorie nicht gefunden
+categories.details.title=Details Kategorie {0}
+categories.details.edit=Bearbeiten
+categories.details.enabled.yes=Ja
+categories.details.enabled.no=Nein
+categories.details.visible.yes=Ja
+categories.details.visible.no=Nein
+categories.details.abstract_category.yes=Ja
+categories.details.abstract_category.no=Nein
+categories.details.enabled=Aktiv?
+categories.details.visible=Sichtbar?
+categories.details.abstract_category=Abstrakte Kategorie?
+categories.details.subcategories.heading=Subkategorien
+categories.details.subcategories.add=Neue Unterkategorie erstellen
+categories.details.subcategories.none=Diese Kategorie hat keine Unterkategorien
+categories.details.subcategories.table.headings.name=Name
+categories.details.subcategories.table.headings.enabled=Aktiv?
+categories.details.subcategories.table.headings.visible=Sichtbar?
+categories.details.subcategories.table.headings.abstract=Abstrakt?
+categories.details.subcategories.delete=L\u00f6schen
+categories.details.subcategories.delete.cancel=Abbrechen
+categories.details.subcategories.delete.confirm=Kategorie l\u00f6schen
+categories.details.subcategories.delete.title=Kategorie l\u00f6schen?
+categories.details.subcategories.delete.message=Sind Sie sicher, dass Sie die Kategorie {0} l\u00f6schen wollen?

From 46bf425f96c30a2146b7c94c85c75d680c938527 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 21 Nov 2020 11:37:03 +0100
Subject: [PATCH 65/93] Typo in JavaDoc

---
 .../main/java/org/libreccm/categorization/CategoryManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java
index 41dc93296..91c752963 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java
@@ -872,7 +872,7 @@ public class CategoryManager implements Serializable {
      * The first entry in the list is the root category, the last entry is the
      * provided category.
      *
-     * @param ofCategory The category for whic the tree is generated.
+     * @param ofCategory The category for which the tree is generated.
      *
      * @return A list of a categories in the path of the provided category.
      */

From 6986786f1254f97e80901eb242812bd60b28df49 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 21 Nov 2020 11:37:19 +0100
Subject: [PATCH 66/93] Query for finding a domain by its root category

---
 .../org/libreccm/categorization/Domain.java   | 36 ++++++++++++-------
 .../categorization/DomainRepository.java      | 33 +++++++++++++----
 2 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
index be258a0ad..505408780 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
@@ -82,21 +82,33 @@ import javax.validation.constraints.NotBlank;
 @Entity
 @Table(name = "CATEGORY_DOMAINS", schema = DB_SCHEMA)
 @NamedQueries({
-    @NamedQuery(name = "Domain.findByKey",
-                query = "SELECT d FROM Domain d WHERE d.domainKey = :key"),
-    @NamedQuery(name = "Domain.findByUri",
-                query = "SELECT d FROM Domain d WHERE d.uri = :uri"),
-    @NamedQuery(name = "Domain.findByUuid",
-                query = "SELECT d FROM Domain d WHERE d.uuid = :uuid"),
-    @NamedQuery(name = "Domain.findAll",
-                query = "SELECT d FROM Domain d ORDER BY d.domainKey"),
+    @NamedQuery(
+        name = "Domain.findByKey",
+        query = "SELECT d FROM Domain d WHERE d.domainKey = :key"
+    ),
+    @NamedQuery(
+        name = "Domain.findByUri",
+        query = "SELECT d FROM Domain d WHERE d.uri = :uri"
+    ),
+    @NamedQuery(
+        name = "Domain.findByUuid",
+        query = "SELECT d FROM Domain d WHERE d.uuid = :uuid"
+    ),
+    @NamedQuery(
+        name = "Domain.findByRootCategory",
+        query = "SELECT d FROM Domain d WHERE d.root = :root"
+    ),
+    @NamedQuery(
+        name = "Domain.findAll",
+        query = "SELECT d FROM Domain d ORDER BY d.domainKey"
+    ),
     @NamedQuery(
         name = "Domain.search",
         query
-            = "SELECT d FROM Domain d "
-                  + "WHERE d.domainKey LIKE CONCAT (LOWER(:term), '%') "
-                  + "OR d.uri LIKE CONCAT (LOWER(:term), '%') "
-                  + "ORDER BY d.domainKey")
+        = "SELECT d FROM Domain d "
+              + "WHERE d.domainKey LIKE CONCAT (LOWER(:term), '%') "
+              + "OR d.uri LIKE CONCAT (LOWER(:term), '%') "
+              + "ORDER BY d.domainKey")
 })
 @NamedEntityGraphs({
     @NamedEntityGraph(
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java
index 17681c952..caff64b7e 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainRepository.java
@@ -55,7 +55,7 @@ public class DomainRepository extends AbstractEntityRepository<Long, Domain> {
     public String getIdAttributeName() {
         return "objectId";
     }
-    
+
     @Override
     public Long getIdOfEntity(final Domain entity) {
         return entity.getObjectId();
@@ -87,6 +87,7 @@ public class DomainRepository extends AbstractEntityRepository<Long, Domain> {
      * @return The {@code Domain} identified by {@code domainKey} or
      *         {@code null} if there is no such {@code Domain}.
      */
+    @Transactional(Transactional.TxType.REQUIRED)
     public Optional<Domain> findByDomainKey(final String domainKey) {
         final TypedQuery<Domain> query = getEntityManager()
             .createNamedQuery("Domain.findByKey", Domain.class);
@@ -111,6 +112,7 @@ public class DomainRepository extends AbstractEntityRepository<Long, Domain> {
      * @return The {@code Domain} identified by the provided URI or {@code null}
      *         if there is so such {@code Domain}.
      */
+    @Transactional(Transactional.TxType.REQUIRED)
     public Domain findByUri(final URI uri) {
         final TypedQuery<Domain> query = getEntityManager()
             .createNamedQuery("Domain.findByUri", Domain.class);
@@ -126,18 +128,37 @@ public class DomainRepository extends AbstractEntityRepository<Long, Domain> {
      *
      * @return An optional either with the found item or empty
      */
+    @Transactional(Transactional.TxType.REQUIRED)
     public Optional<Domain> findByUuid(final String uuid) {
-        final TypedQuery<Domain> query = getEntityManager()
-            .createNamedQuery("Domain.findByUuid", Domain.class);
-        query.setParameter("uuid", uuid);
-
         try {
-            return Optional.of(query.getSingleResult());
+            return Optional.of(
+                getEntityManager()
+                    .createNamedQuery("Domain.findByUuid", Domain.class)
+                    .setParameter("uuid", uuid)
+                    .getSingleResult()
+            );
         } catch (NoResultException ex) {
             return Optional.empty();
         }
     }
 
+    @Transactional(Transactional.TxType.REQUIRED)
+    public Optional<Domain> findByRootCategory(final Category rootCategory) {
+        try {
+            return Optional.of(
+                getEntityManager()
+                    .createNamedQuery(
+                        "Domain.findByRootCategory", Domain.class
+                    )
+                    .setParameter("root", rootCategory)
+                    .getSingleResult()
+            );
+        } catch (NoResultException ex) {
+            return Optional.empty();
+        }
+    }
+
+    @Transactional(Transactional.TxType.REQUIRED)
     public List<Domain> search(final String term) {
         final TypedQuery<Domain> query = getEntityManager()
             .createNamedQuery("Domain.search", Domain.class);

From 0387b14aac41701dd84ebafe6dee08daa6f2aa86 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 21 Nov 2020 13:58:10 +0100
Subject: [PATCH 67/93] Bugfix

---
 ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java b/ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java
index 5919eea24..da2e48d9b 100644
--- a/ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java
+++ b/ccm-core/src/main/java/org/libreccm/api/IdentifierParser.java
@@ -40,7 +40,7 @@ public class IdentifierParser {
             ApiConstants.IDENTIFIER_PREFIX_UUID)) {
             final String identifier = identifierParam
                 .substring(ApiConstants.IDENTIFIER_PREFIX_UUID.length());
-            return new Identifier(IdentifierType.ID, identifier);
+            return new Identifier(IdentifierType.UUID, identifier);
         } else {
             return new Identifier(
                 IdentifierType.PROPERTY, identifierParam

From b3d870eb5742856fc9ff8fac565b74c9f7620051 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 21 Nov 2020 14:02:06 +0100
Subject: [PATCH 68/93] Fixed a typo

---
 .../META-INF/resources/components/bootstrap/formCheck.xhtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml
index 540e02fe9..7e4dd479e 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml
@@ -32,11 +32,11 @@
     </cc:interface>
     <cc:implementation>
         <div class="form-check">
-            <input class="form-check-input" 
+            <input checked="#{cc.attrs.value ? 'checked': null}"
+                class="form-check-input" 
                    id="#{cc.attrs.inputId}"
                    name="#{cc.attrs.name}"
-                   type="checkbox"
-                   value="#{cc.attrs.value}" />
+                   type="checkbox" />
             <label for="#{cc.attrs.inputId}">#{cc.attrs.label}</label>
         </div>
     </cc:implementation>

From d61090d0fd826095c3760c866773267424f3d86d Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 21 Nov 2020 21:57:44 +0100
Subject: [PATCH 69/93] CategoryManagement

---
 .../categories/CategoriesController.java      |  96 ++++++++----
 .../categories/CategoryDetailsModel.java      | 100 ++++++++++++-
 .../categories/CategoryFormController.java    |  49 +++++--
 .../admin/categories/CategoryNodeModel.java   |  58 ++++++--
 .../admin/categories/CategoryPathModel.java   |  63 ++++++++
 .../CategorySystemDetailsModel.java           |  26 +++-
 .../ui/admin/categories/CategoryTableRow.java | 137 ------------------
 .../ui/admin/categories/DomainNodeModel.java  |  61 ++++++++
 .../components/libreccm/deleteDialog.xhtml    |  26 ++--
 .../libreccm/localizedStringEditor.xhtml      |   3 +-
 .../admin/categories/category-details.xhtml   |  46 ++++--
 .../ui/admin/categories/category-form.xhtml   |  27 ++--
 .../categories/categorysystem-details.xhtml   |   5 +-
 .../org/libreccm/ui/AdminBundle.properties    |  54 +++++++
 .../org/libreccm/ui/AdminBundle_de.properties |  54 +++++++
 15 files changed, 565 insertions(+), 240 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryPathModel.java
 delete mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryTableRow.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/DomainNodeModel.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
index af84030bb..794122db0 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
@@ -30,6 +30,8 @@ import org.libreccm.ui.Message;
 import org.libreccm.ui.MessageType;
 import org.libreccm.ui.admin.AdminMessages;
 
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.Optional;
@@ -38,13 +40,17 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
-import javax.mvc.MvcContext;
+import javax.servlet.http.HttpServletRequest;
 import javax.transaction.Transactional;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Encoded;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
 
 /**
  *
@@ -72,7 +78,7 @@ public class CategoriesController {
 
     @Inject
     private Models models;
-    
+
     @GET
     @Path("/{categoryIdentifier}")
     @AuthorizationRequired
@@ -163,7 +169,37 @@ public class CategoriesController {
     public String newSubCategory(
         @PathParam("categoryIdentifier") final String categoryIdentifier
     ) {
-        return "org/libreccm/ui/admin/categories/category-form.xhtml";
+        final Identifier identifier = identifierParser.parseIdentifier(
+            categoryIdentifier
+        );
+        final Optional<Category> result;
+        switch (identifier.getType()) {
+            case ID:
+                result = categoryRepository.findById(
+                    Long.parseLong(identifier.getIdentifier())
+                );
+                break;
+            default:
+                result = categoryRepository.findByUuid(
+                    identifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            categoryDetailsModel.setParentCategory(result.get());
+            return "org/libreccm/ui/admin/categories/category-form.xhtml";
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifier)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
     }
 
     @POST
@@ -306,17 +342,16 @@ public class CategoriesController {
     }
 
     @POST
-    @Path("/{categoryIdentifier}/title/add")
+    @Path("/{identifier}/title/add")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String addTitle(
-        @PathParam("categoryIdentifier")
-        final String categoryIdentifierParam,
+        @PathParam("identifier") final String identifierParam,
         @FormParam("locale") final String localeParam,
         @FormParam("value") final String value
     ) {
         final Identifier identifier = identifierParser.parseIdentifier(
-            categoryIdentifierParam
+            identifierParam
         );
         final Optional<Category> result;
         switch (identifier.getType()) {
@@ -347,7 +382,7 @@ public class CategoriesController {
                 new Message(
                     adminMessages.getMessage(
                         "categories.not_found.message",
-                        Arrays.asList(categoryIdentifierParam)
+                        Arrays.asList(identifierParam)
                     ), MessageType.WARNING
                 )
             );
@@ -356,17 +391,16 @@ public class CategoriesController {
     }
 
     @POST
-    @Path("/{categoryIdentifier}/title/${locale}/edit")
+    @Path("/{identifier}/title/{locale}/edit")
     @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public String editTitle(
-        @PathParam("categoryIdentifier")
-        final String categoryIdentifierParam,
+        @PathParam("identifier") final String identifierParam,
         @PathParam("locale") final String localeParam,
         @FormParam("value") final String value
     ) {
         final Identifier identifier = identifierParser.parseIdentifier(
-            categoryIdentifierParam
+            identifierParam
         );
         final Optional<Category> result;
         switch (identifier.getType()) {
@@ -397,7 +431,7 @@ public class CategoriesController {
                 new Message(
                     adminMessages.getMessage(
                         "categories.not_found.message",
-                        Arrays.asList(categoryIdentifierParam)
+                        Arrays.asList(identifierParam)
                     ), MessageType.WARNING
                 )
             );
@@ -406,10 +440,11 @@ public class CategoriesController {
     }
 
     @POST
-    @Path("/{categoryIdentifier}/title/${locale}/remove")
+    @Path("/{identifier}/title/{locale}/remove")
     @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public String removeTitle(
-        @PathParam("categoryIdentifier")
+        @PathParam("identifier")
         final String categoryIdentifierParam,
         @PathParam("locale") final String localeParam
     ) {
@@ -454,16 +489,16 @@ public class CategoriesController {
     }
 
     @POST
-    @Path("/{categoryIdentifier}description/add")
+    @Path("/{identifier}decsription/add")
     @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public String addDescription(
-        @PathParam("categoryIdentifier")
-        final String categoryIdentifierParam,
+        @PathParam("identifier") final String identifierParam,
         @FormParam("locale") final String localeParam,
         @FormParam("value") final String value
     ) {
         final Identifier identifier = identifierParser.parseIdentifier(
-            categoryIdentifierParam
+            identifierParam
         );
         final Optional<Category> result;
         switch (identifier.getType()) {
@@ -494,7 +529,7 @@ public class CategoriesController {
                 new Message(
                     adminMessages.getMessage(
                         "categories.not_found.message",
-                        Arrays.asList(categoryIdentifierParam)
+                        Arrays.asList(identifierParam)
                     ), MessageType.WARNING
                 )
             );
@@ -503,16 +538,17 @@ public class CategoriesController {
     }
 
     @POST
-    @Path("/{categoryIdentifier}/description/${locale}/edit")
+    @Path("/{identifier}/description/{locale}/edit")
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
     @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public String editDescription(
-        @PathParam("categoryIdentifier")
-        final String categoryIdentifierParam,
+        @PathParam("identifier") final String identifierParam,
         @PathParam("locale") final String localeParam,
         @FormParam("value") final String value
     ) {
         final Identifier identifier = identifierParser.parseIdentifier(
-            categoryIdentifierParam
+            identifierParam
         );
         final Optional<Category> result;
         switch (identifier.getType()) {
@@ -543,7 +579,7 @@ public class CategoriesController {
                 new Message(
                     adminMessages.getMessage(
                         "categories.not_found.message",
-                        Arrays.asList(categoryIdentifierParam)
+                        Arrays.asList(identifierParam)
                     ), MessageType.WARNING
                 )
             );
@@ -552,15 +588,15 @@ public class CategoriesController {
     }
 
     @POST
-    @Path("/{categoryIdentifier}/description/${locale}/remove")
+    @Path("/{identifier}/description/{locale}/remove")
     @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public String removeDescription(
-        @PathParam("categoryIdentifier")
-        final String categoryIdentifierParam,
+        @PathParam("identifier") final String identifierParam,
         @PathParam("locale") final String localeParam
     ) {
         final Identifier identifier = identifierParser.parseIdentifier(
-            categoryIdentifierParam
+            identifierParam
         );
         final Optional<Category> result;
         switch (identifier.getType()) {
@@ -591,7 +627,7 @@ public class CategoriesController {
                 new Message(
                     adminMessages.getMessage(
                         "categories.not_found.message",
-                        Arrays.asList(categoryIdentifierParam)
+                        Arrays.asList(identifierParam)
                     ), MessageType.WARNING
                 )
             );
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
index 0aba4b14a..c34a21867 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
@@ -20,14 +20,19 @@ package org.libreccm.ui.admin.categories;
 
 import org.libreccm.categorization.Category;
 import org.libreccm.categorization.CategoryManager;
+import org.libreccm.categorization.Domain;
+import org.libreccm.categorization.DomainRepository;
+import org.libreccm.l10n.GlobalizationHelper;
 import org.libreccm.ui.Message;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -47,6 +52,12 @@ public class CategoryDetailsModel {
     @Inject
     private CategoryManager categoryManager;
 
+    @Inject
+    private DomainRepository domainRepository;
+    
+    @Inject
+    private GlobalizationHelper globalizationHelper;
+
     private long categoryId;
 
     private String uuid;
@@ -59,8 +70,12 @@ public class CategoryDetailsModel {
 
     private Map<String, String> title;
 
+    private List<String> unusedTitleLocales;
+
     private Map<String, String> description;
 
+    private List<String> unusedDescriptionLocales;
+
     private boolean enabled;
 
     private boolean visible;
@@ -71,6 +86,8 @@ public class CategoryDetailsModel {
 
     private CategoryNodeModel parentCategory;
 
+    private CategoryPathModel categoryPath;
+
     private long categoryOrder;
 
     private final List<Message> messages;
@@ -109,10 +126,26 @@ public class CategoryDetailsModel {
         return Collections.unmodifiableMap(title);
     }
 
+    public List<String> getUnusedTitleLocales() {
+        return Collections.unmodifiableList(unusedTitleLocales);
+    }
+
+    public boolean hasUnusedTitleLocales() {
+        return !unusedTitleLocales.isEmpty();
+    }
+
     public Map<String, String> getDescription() {
         return Collections.unmodifiableMap(description);
     }
 
+    public List<String> getUnusedDescriptionLocales() {
+        return Collections.unmodifiableList(unusedDescriptionLocales);
+    }
+
+    public boolean hasUnusedDescriptionLocales() {
+        return !unusedDescriptionLocales.isEmpty();
+    }
+
     public boolean isEnabled() {
         return enabled;
     }
@@ -137,6 +170,10 @@ public class CategoryDetailsModel {
         parentCategory = buildCategoryNodeModel(parent);
     }
 
+    public CategoryPathModel getCategoryPath() {
+        return categoryPath;
+    }
+
     public long getCategoryOrder() {
         return categoryOrder;
     }
@@ -174,6 +211,9 @@ public class CategoryDetailsModel {
         uniqueId = category.getUniqueId();
         name = category.getName();
         path = categoryManager.getCategoryPath(category);
+
+        final List<Locale> availableLocales = globalizationHelper
+            .getAvailableLocales();
         title = category
             .getTitle()
             .getValues()
@@ -185,6 +225,16 @@ public class CategoryDetailsModel {
                     entry -> entry.getValue()
                 )
             );
+        final Set<Locale> titleLocales = category
+            .getTitle()
+            .getAvailableLocales();
+        unusedTitleLocales = availableLocales
+            .stream()
+            .filter(locale -> !titleLocales.contains(locale))
+            .map(Locale::toString)
+            .sorted()
+            .collect(Collectors.toList());
+
         description = category
             .getDescription()
             .getValues()
@@ -196,6 +246,16 @@ public class CategoryDetailsModel {
                     entry -> entry.getValue()
                 )
             );
+        final Set<Locale> descriptionLocales = category
+            .getDescription()
+            .getAvailableLocales();
+        unusedDescriptionLocales = availableLocales
+            .stream()
+            .filter(locale -> !descriptionLocales.contains(locale))
+            .map(Locale::toString)
+            .sorted()
+            .collect(Collectors.toList());
+
         enabled = category.isEnabled();
         visible = category.isVisible();
         abstractCategory = category.isAbstractCategory();
@@ -205,10 +265,23 @@ public class CategoryDetailsModel {
             .map(this::buildCategoryNodeModel)
             .sorted()
             .collect(Collectors.toList());
-        parentCategory = buildCategoryNodeModel(category.getParentCategory());
+        if (category.getParentCategory() != null) {
+            parentCategory
+                = buildCategoryNodeModel(category.getParentCategory());
+        }
+        categoryPath = buildCategoryPathModel(category);
         categoryOrder = category.getCategoryOrder();
     }
 
+    private DomainNodeModel buildDomainNodeModel(final Domain domain) {
+        final DomainNodeModel model = new DomainNodeModel();
+        model.setDomainId(domain.getObjectId());
+        model.setUuid(domain.getUuid());
+        model.setDomainKey(domain.getDomainKey());
+
+        return model;
+    }
+
     private CategoryNodeModel buildCategoryNodeModel(final Category category) {
         final CategoryNodeModel model = new CategoryNodeModel();
         model.setCategoryId(category.getObjectId());
@@ -217,7 +290,32 @@ public class CategoryDetailsModel {
         model.setName(category.getName());
         model.setPath(categoryManager.getCategoryPath(category));
         model.setCategoryOrder(category.getCategoryOrder());
+        model.setEnabled(category.isEnabled());
+        model.setVisible(category.isVisible());
+        model.setAbstractCategory(category.isAbstractCategory());
         return model;
     }
 
+    private CategoryPathModel buildCategoryPathModel(final Category category) {
+        return buildCategoryPathModel(category, new CategoryPathModel());
+    }
+
+    private CategoryPathModel buildCategoryPathModel(
+        final Category category,
+        final CategoryPathModel categoryPathModel
+    ) {
+        categoryPathModel.addCategoryAtBegin(buildCategoryNodeModel(category));
+        final Category parent = category.getParentCategory();
+        if (parent == null) {
+            final Optional<Domain> domain = domainRepository
+                .findByRootCategory(category);
+            if (domain.isPresent()) {
+                categoryPathModel.setDomain(buildDomainNodeModel(domain.get()));
+            }
+            return categoryPathModel;
+        } else {
+            return buildCategoryPathModel(parent, categoryPathModel);
+        }
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
index 3ecaa31b8..36e88016f 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
@@ -23,6 +23,8 @@ import org.libreccm.api.IdentifierParser;
 import org.libreccm.categorization.Category;
 import org.libreccm.categorization.CategoryManager;
 import org.libreccm.categorization.CategoryRepository;
+import org.libreccm.categorization.Domain;
+import org.libreccm.categorization.DomainRepository;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
@@ -63,6 +65,9 @@ public class CategoryFormController {
     @Inject
     private CategoryRepository categoryRepository;
 
+    @Inject
+    private DomainRepository domainRepository;
+    
     @Inject
     private IdentifierParser identifierParser;
 
@@ -73,13 +78,13 @@ public class CategoryFormController {
     private String name;
 
     @FormParam("enabled")
-    private boolean enabled;
+    private String enabled;
 
     @FormParam("visible")
-    private boolean visible;
+    private String visible;
 
     @FormParam("abstractCategory")
-    private boolean abstractCategory;
+    private String abstractCategory;
 
     @POST
     @Path("/{parentCategoryIdentifier}/new")
@@ -113,17 +118,33 @@ public class CategoryFormController {
             final Category category = new Category();
             category.setUniqueId(uniqueId);
             category.setName(name);
-            category.setEnabled(enabled);
-            category.setVisible(visible);
-            category.setAbstractCategory(abstractCategory);
+            category.setEnabled(enabled != null);
+            category.setVisible(visible != null);
+            category.setAbstractCategory(abstractCategory != null);
 
             categoryRepository.save(category);
             categoryManager.addSubCategoryToCategory(category, parentCategory);
 
-            return String.format(
-                "redirect:categorymanager/categories/ID-%s",
-                parentCategory.getObjectId()
-            );
+            if (parentCategory.getParentCategory() == null) {
+                final Optional<Domain> categorySystem = domainRepository
+                    .findByRootCategory(parentCategory);
+                if (categorySystem.isPresent()) {
+                    return String.format(
+                        "redirect:categorymanager/categorysystems/ID-%d/details",
+                        categorySystem.get().getObjectId()
+                    );
+                } else {
+                    return String.format(
+                    "redirect:categorymanager/categories/ID-%d/details",
+                    parentCategory.getObjectId()
+                );
+                }
+            } else {
+                return String.format(
+                    "redirect:categorymanager/categories/ID-%d/details",
+                    parentCategory.getObjectId()
+                );
+            }
         } else {
             categoryDetailsModel.addMessage(
                 new Message(
@@ -143,7 +164,7 @@ public class CategoryFormController {
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
     public String updateCategory(
-        @PathParam("categoryIdentifierParam")
+        @PathParam("categoryIdentifier")
         final String categoryIdentifierParam
     ) {
         final Identifier identifier = identifierParser.parseIdentifier(
@@ -169,9 +190,9 @@ public class CategoryFormController {
             final Category category = result.get();
             category.setUniqueId(uniqueId);
             category.setName(name);
-            category.setEnabled(enabled);
-            category.setVisible(visible);
-            category.setAbstractCategory(abstractCategory);
+            category.setEnabled(enabled != null);
+            category.setVisible(visible != null);
+            category.setAbstractCategory(abstractCategory != null);
 
             categoryRepository.save(category);
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
index f435f7a37..3ff21db32 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
@@ -18,8 +18,6 @@
  */
 package org.libreccm.ui.admin.categories;
 
-import org.libreccm.categorization.Category;
-
 import java.util.Objects;
 
 /**
@@ -35,9 +33,15 @@ public class CategoryNodeModel implements Comparable<CategoryNodeModel> {
     private String uniqueId;
 
     private String name;
-    
+
     private String path;
 
+    private boolean enabled;
+
+    private boolean visible;
+
+    private boolean abstractCategory;
+
     private long categoryOrder;
 
     public long getCategoryId() {
@@ -47,15 +51,15 @@ public class CategoryNodeModel implements Comparable<CategoryNodeModel> {
     protected void setCategoryId(final long categoryId) {
         this.categoryId = categoryId;
     }
-    
+
     public String getIdentifier() {
         return String.format("ID-%d", categoryId);
     }
-    
+
     public String getUuid() {
         return uuid;
     }
-    
+
     protected void setUuid(final String uuid) {
         this.uuid = uuid;
     }
@@ -63,7 +67,7 @@ public class CategoryNodeModel implements Comparable<CategoryNodeModel> {
     public String getUniqueId() {
         return uniqueId;
     }
-    
+
     protected void setUniqueId(final String uniqueId) {
         this.uniqueId = uniqueId;
     }
@@ -71,15 +75,15 @@ public class CategoryNodeModel implements Comparable<CategoryNodeModel> {
     public String getName() {
         return name;
     }
-    
+
     protected void setName(final String name) {
         this.name = name;
     }
-    
+
     public String getPath() {
         return path;
     }
-    
+
     protected void setPath(final String path) {
         this.path = path;
     }
@@ -91,22 +95,46 @@ public class CategoryNodeModel implements Comparable<CategoryNodeModel> {
     protected void setCategoryOrder(final long categoryOrder) {
         this.categoryOrder = categoryOrder;
     }
-    
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    protected void setEnabled(final boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+
+    protected void setVisible(final boolean visible) {
+        this.visible = visible;
+    }
+
+    public boolean isAbstractCategory() {
+        return abstractCategory;
+    }
+
+    protected void setAbstractCategory(final boolean abstractCategory) {
+        this.abstractCategory = abstractCategory;
+    }
+
     @Override
     public int compareTo(final CategoryNodeModel other) {
         int result = Long.compare(
             categoryOrder,
             Objects.requireNonNull(other).getCategoryOrder()
         );
-        
+
         if (result == 0) {
             result = Objects.compare(
-                name, 
-                Objects.requireNonNull(other).getName(), 
+                name,
+                Objects.requireNonNull(other).getName(),
                 String::compareTo
             );
         }
-        
+
         return result;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryPathModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryPathModel.java
new file mode 100644
index 000000000..181bb8ea1
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryPathModel.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class CategoryPathModel {
+
+    private DomainNodeModel domain;
+
+    private List<CategoryNodeModel> categories;
+    
+    public CategoryPathModel() {
+        categories = new ArrayList<>();
+    }
+
+    public DomainNodeModel getDomain() {
+        return domain;
+    }
+
+    protected void setDomain(final DomainNodeModel domain) {
+        this.domain = domain;
+    }
+
+    public List<CategoryNodeModel> getCategories() {
+        return Collections.unmodifiableList(categories);
+    }
+
+    protected void addCategory(final CategoryNodeModel category) {
+        categories.add(category);
+    }
+    
+    protected void addCategoryAtBegin(final CategoryNodeModel category) {
+        categories.add(0, category);
+    }
+    
+    protected void setCategories(final List<CategoryNodeModel> categories) {
+        this.categories = new ArrayList<>(categories);
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index 2487a9535..9dbc13ed9 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -18,6 +18,8 @@
  */
 package org.libreccm.ui.admin.categories;
 
+import org.libreccm.categorization.Category;
+import org.libreccm.categorization.CategoryManager;
 import org.libreccm.categorization.Domain;
 import org.libreccm.categorization.DomainOwnership;
 import org.libreccm.l10n.GlobalizationHelper;
@@ -54,6 +56,9 @@ public class CategorySystemDetailsModel {
     @Inject
     private ApplicationRepository applicationRepository;
 
+    @Inject
+    private CategoryManager categoryManager;
+    
     @Inject
     private GlobalizationHelper globalizationHelper;
 
@@ -83,7 +88,7 @@ public class CategorySystemDetailsModel {
     
     private String rootIdentifier;
     
-    private List<CategoryTableRow> categories;
+    private List<CategoryNodeModel> categories;
 
     private final List<Message> messages;
 
@@ -194,7 +199,7 @@ public class CategorySystemDetailsModel {
         return Collections.unmodifiableList(ownerOptions);
     }
 
-    public List<CategoryTableRow> getCategories() {
+    public List<CategoryNodeModel> getCategories() {
         return Collections.unmodifiableList(categories);
     }
     
@@ -238,6 +243,7 @@ public class CategorySystemDetailsModel {
                 .withZone(ZoneOffset.systemDefault())
                 .format(domain.getReleased());
         }
+       
         final List<Locale> availableLocales = globalizationHelper
             .getAvailableLocales();
         title = domain
@@ -310,7 +316,7 @@ public class CategorySystemDetailsModel {
             .getRoot()
             .getSubCategories()
             .stream()
-            .map(CategoryTableRow::new)
+            .map(this::buildCategoryTableRow)
             .sorted()
             .collect(Collectors.toList());
     }
@@ -331,5 +337,19 @@ public class CategorySystemDetailsModel {
 
         return ownerRow;
     }
+    
+    private CategoryNodeModel buildCategoryTableRow(final Category category) {
+        final CategoryNodeModel row = new CategoryNodeModel();
+        row.setCategoryId(category.getObjectId());
+        row.setUuid(category.getUuid());
+        row.setUniqueId(category.getUniqueId());
+        row.setName(category.getName());
+        row.setPath(categoryManager.getCategoryPath(category));
+        row.setEnabled(category.isEnabled());
+        row.setVisible(category.isVisible());
+        row.setAbstractCategory(category.isAbstractCategory());
+        row.setCategoryOrder(category.getCategoryOrder());
+        return row;
+    }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryTableRow.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryTableRow.java
deleted file mode 100644
index ddb95eb26..000000000
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryTableRow.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2020 LibreCCM Foundation.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301  USA
- */
-package org.libreccm.ui.admin.categories;
-
-import org.libreccm.categorization.Category;
-
-import java.util.Objects;
-
-/**
- *
- * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
- */
-public class CategoryTableRow implements Comparable<CategoryTableRow> {
-
-    private long categoryId;
-
-    private String uuid;
-
-    private String uniqueId;
-
-    private String name;
-
-    private boolean enabled;
-
-    private boolean visible;
-
-    private boolean abstractCategory;
-
-    private long categoryOrder;
-
-    public CategoryTableRow() {
-        super();
-    }
-    
-    public CategoryTableRow(final Category category) {
-        categoryId = category.getObjectId();
-        uuid = category.getUuid();
-        uniqueId = category.getUniqueId();
-        name = category.getName();
-        enabled = category.isEnabled();
-        visible = category.isVisible();
-        abstractCategory = category.isAbstractCategory();
-        categoryOrder = category.getCategoryOrder();
-    }
-    
-    public long getCategoryId() {
-        return categoryId;
-    }
-
-    protected void setCategoryId(final long categoryId) {
-        this.categoryId = categoryId;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    protected void setUuid(final String uuid) {
-        this.uuid = uuid;
-    }
-    
-    public String getIdentifier() {
-        return String.format("UUID-%s", uuid);
-    }
-
-    public String getUniqueId() {
-        return uniqueId;
-    }
-
-    protected void setUniqueId(final String uniqueId) {
-        this.uniqueId = uniqueId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    protected void setName(final String name) {
-        this.name = name;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    protected void setEnabled(final boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public boolean isVisible() {
-        return visible;
-    }
-
-    protected void setVisible(final boolean visible) {
-        this.visible = visible;
-    }
-
-    public boolean isAbstractCategory() {
-        return abstractCategory;
-    }
-
-    protected void setAbstractCategory(final boolean abstractCategory) {
-        this.abstractCategory = abstractCategory;
-    }
-
-    public long getCategoryOrder() {
-        return categoryOrder;
-    }
-
-    protected void setCategoryOrder(final long categoryOrder) {
-        this.categoryOrder = categoryOrder;
-    }
-
-    @Override
-    public int compareTo(final CategoryTableRow other) {
-        return Long.compare(
-            categoryOrder, Objects.requireNonNull(other).getCategoryOrder()
-        );
-    }
-
-}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/DomainNodeModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/DomainNodeModel.java
new file mode 100644
index 000000000..b5ec284f1
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/DomainNodeModel.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.categories;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class DomainNodeModel {
+
+    private long domainId;
+
+    private String uuid;
+
+    private String domainKey;
+
+    public long getDomainId() {
+        return domainId;
+    }
+
+    protected void setDomainId(final long domainId) {
+        this.domainId = domainId;
+    }
+    
+    public String getIdentifier() {
+        return String.format("ID-%s", domainId);
+    }
+    
+    public String getUuid() {
+        return uuid;
+    }
+
+    protected void setUuid(final String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getDomainKey() {
+        return domainKey;
+    }
+
+    protected void setDomainKey(final String domainKey) {
+        this.domainKey = domainKey;
+    }
+
+}
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml
index a84166be1..c661863db 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml
@@ -9,7 +9,7 @@
                       shortDescription="URL to POST request is send." />
         <cc:attribute name="buttonText"
                       required="true"
-                      shortDescription="Text pf the button toggleing the modal form."
+                      shortDescription="Text of the button toggleing the modal form."
                       type="String" />
         <cc:attribute name="buttonTextClass"
                       default=""
@@ -70,35 +70,35 @@
                             <c:choose>
                                 <c:when test="#{cc.attrs.headingLevel == 1}">
                                     <h2 class="modal-title"
-                                        id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h2>
+                                        id="#{cc.attrs.dialogId}-dialog-title">#{cc.attrs.dialogTitle}</h2>
                                 </c:when>
                                 <c:when test="#{cc.attrs.headingLevel == 2}">
                                     <h3 class="modal-title"
-                                        id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h3>
+                                        id="#{cc.attrs.dialogId}-dialog-title">#{cc.attrs.dialogTitle}</h3>
                                 </c:when>
                                 <c:when test="#{cc.attrs.headingLevel == 3}">
                                     <h4 class="modal-title"
-                                        id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h4>
+                                        id="#{cc.attrs.dialogId}-dialog-title">#{cc.attrs.dialogTitle}</h4>
                                 </c:when>
                                 <c:when test="#{cc.attrs.headingLevel == 4}">
                                     <h5 class="modal-title"
-                                        id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h5>
+                                        id="#{cc.attrs.dialogId}-dialog-title">#{cc.attrs.dialogTitle}</h5>
                                 </c:when>
                                 <c:when test="#{cc.attrs.headingLevel == 5}">
                                     <h6 class="modal-title"
-                                        id="#{cc.attrs.editorId}-dialog-title">#{cc.attrs.addDialogTitle}</h6>
+                                        id="#{cc.attrs.dialogId}-dialog-title">#{cc.attrs.dialogTitle}</h6>
                                 </c:when>
                                 <c:otherwise>
-                                    <div>#{cc.attrs.addDialogTitle}</div>
+                                    <div>#{cc.attrs.dialogTitle}</div>
                                 </c:otherwise>
                             </c:choose>
-                            <button aria-label="#{cc.attrs.addDialogCancelLabel}"
-                                    class="close" 
-                                    data-dismiss="modal" 
-                                    type="button"   >
-                                <span aria-hidden="true">&times;</span>
-                            </button>
                         </div>
+                        <button aria-label="#{cc.attrs.cancelLabel}"
+                                class="close" 
+                                data-dismiss="modal" 
+                                type="button"   >
+                            <span aria-hidden="true">&times;</span>
+                        </button>
                     </div>
                     <div class="modal-body">
                         <p>
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml
index be4483553..f68a2c444 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/localizedStringEditor.xhtml
@@ -345,7 +345,8 @@
                                              id="#{cc.attrs.editorId}-#{entry.key}-edit-dialog"
                                              tabindex="-1">
                                             <div class="modal-dialog">
-                                                <form action="#{mvc.uri(cc.attrs.addMethod, { 'identifier': cc.attrs.objectIdentifier, 'locale': entry.key })}"
+                                                <form accept-charset="UTF-8"
+                                                      action="#{mvc.uri(cc.attrs.editMethod, { 'identifier': cc.attrs.objectIdentifier, 'locale': entry.key })}"
                                                       class="modal-content"
                                                       method="post">
                                                     <div class="modal-header">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
index c7110071d..d9e039a18 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
@@ -45,6 +45,23 @@
                         <dt>#{AdminMessages['categories.details.name']}</dt>
                         <dd>#{CategoryDetailsModel.name}</dd>
                     </div>
+                    <div>
+                        <dt>#{AdminMessages['categories.details.path']}</dt>
+                        <dd>
+                            <c:if test="#{CategoryDetailsModel.categoryPath.domain != null}">
+                                <a href="#{mvc.uri('CategorySystemsController#getCategorySystemDetails', {'categorySystemIdentifier': CategoryDetailsModel.categoryPath.domain.identifier})}">
+                                    #{CategoryDetailsModel.categoryPath.domain.domainKey}
+                                </a>
+                            </c:if>
+                            <c:forEach items="#{CategoryDetailsModel.categoryPath.categories}" 
+                                       var="category" >
+                                <span>/</span>
+                                <a href="#{mvc.uri('CategoriesController#getCategory', {'categoryIdentifier': category.identifier})}">
+                                    #{category.name}
+                                </a>
+                            </c:forEach>
+                        </dd>
+                    </div>
                     <div>
                         <dt>#{AdminMessages['categories.details.enabled']}</dt>
                         <dd>
@@ -62,7 +79,7 @@
                         <dt>#{AdminMessages['categories.details.visible']}</dt>
                         <dd>
                             <c:choose>
-                                <c:when test="#{CategoryDetailsModel.enabled}">
+                                <c:when test="#{CategoryDetailsModel.visible}">
                                     #{AdminMessages['categories.details.visible.yes']}
                                 </c:when>
                                 <c:otherwise>
@@ -75,7 +92,7 @@
                         <dt>#{AdminMessages['categories.details.abstract_category']}</dt>
                         <dd>
                             <c:choose>
-                                <c:when test="#{CategoryDetailsModel.enabled}">
+                                <c:when test="#{CategoryDetailsModel.abstractCategory}">
                                     #{AdminMessages['categories.details.abstract_category.yes']}
                                 </c:when>
                                 <c:otherwise>
@@ -110,10 +127,10 @@
                                                 editDialogValueHelp="#{AdminMessages['categories.details.title.edit.dialog.value.help']}"
                                                 editDialogValueLabel="#{AdminMessages['categories.details.title.edit.dialog.value.label']}"
                                                 editMethod="CategoriesController#editTitle"
-                                                editorId="categorysystem-title"
+                                                editorId="category-title"
                                                 emptyText="#{AdminMessages['categories.details.title.none']}"
-                                                hasUnusedLocales="#{CategorySystemDetailsModel.hasUnusedTitleLocales()}"
-                                                objectIdentifier="#{CategorySystemDetailsModel.identifier}"
+                                                hasUnusedLocales="#{CategoryDetailsModel.hasUnusedTitleLocales()}"
+                                                objectIdentifier="#{CategoryDetailsModel.identifier}"
                                                 removeButtonLabel="#{AdminMessages['categories.details.title.table.actions.remove']}"
                                                 removeDialogCancelLabel="#{AdminMessages['categories.details.title.remove.dialog.close']}"
                                                 removeDialogSubmitLabel="#{AdminMessages['categories.details.title.remove.dialog.submit']}"
@@ -124,8 +141,8 @@
                                                 tableLocaleHeading="#{AdminMessages['categories.details.title.table.headings.locale']}"
                                                 tableValueHeading="#{AdminMessages['categories.details.title.table.headings.value']}"
                                                 title="#{AdminMessages['categories.details.title.heading']}"
-                                                unusedLocales="#{CategorySystemDetailsModel.unusedTitleLocales}"
-                                                values="#{CategorySystemDetailsModel.title}" />
+                                                unusedLocales="#{CategoryDetailsModel.unusedTitleLocales}"
+                                                values="#{CategoryDetailsModel.title}" />
 
                 <libreccm:localizedStringEditor addMethod="CategoriesController#addDescription"
                                                 addButtonLabel="#{AdminMessages['categories.details.description.add']}"
@@ -143,10 +160,10 @@
                                                 editDialogValueHelp="#{AdminMessages['categories.details.description.edit.dialog.value.help']}"
                                                 editDialogValueLabel="#{AdminMessages['categories.details.description.edit.dialog.value.label']}"
                                                 editMethod="CategoriesController#editDescription"
-                                                editorId="categorysystem-description"
+                                                editorId="category-description"
                                                 emptyText="#{AdminMessages['categories.details.description.none']}"
-                                                hasUnusedLocales="#{CategorySystemDetailsModel.hasUnusedDescriptionLocales()}"
-                                                objectIdentifier="#{CategorySystemDetailsModel.identifier}"
+                                                hasUnusedLocales="#{CategoryDetailsModel.hasUnusedDescriptionLocales()}"
+                                                objectIdentifier="#{CategoryDetailsModel.identifier}"
                                                 removeButtonLabel="#{AdminMessages['categories.details.description.table.actions.remove']}"
                                                 removeDialogCancelLabel="#{AdminMessages['categories.details.description.remove.dialog.close']}"
                                                 removeDialogSubmitLabel="#{AdminMessages['categories.details.description.remove.dialog.submit']}"
@@ -157,15 +174,15 @@
                                                 tableLocaleHeading="#{AdminMessages['categories.details.description.table.headings.locale']}"
                                                 tableValueHeading="#{AdminMessages['categories.details.description.table.headings.value']}"
                                                 title="#{AdminMessages['categories.details.description.heading']}"
-                                                unusedLocales="#{CategorySystemDetailsModel.unusedTitleLocales}"
+                                                unusedLocales="#{CategoryDetailsModel.unusedDescriptionLocales}"
                                                 useTextarea="true"
-                                                values="#{CategorySystemDetailsModel.description}" />
+                                                values="#{CategoryDetailsModel.description}" />
 
                 <h2>#{AdminMessages['categories.details.subcategories.heading']}</h2>
                 <div class="mb-2">
                     <div class="text-right">
                         <a class="btn btn-secondary"
-                           href="#{mvc.uri('CategoriesController#newSubCategory', {'categoryIdentifier': CategorySystemDetailsModel.parentIdentifier})}">
+                           href="#{mvc.uri('CategoriesController#newSubCategory', {'categoryIdentifier': CategoryDetailsModel.identifier})}">
                             <bootstrap:svgIcon icon="plus-circle" />
                             <span>#{AdminMessages['categories.details.subcategories.add']}</span>
                         </a>
@@ -247,9 +264,10 @@
                                     </tr>
                                 </c:forEach>
                             </tbody>
+                        </table>
                     </c:otherwise>
                 </c:choose>
-
+                
             </div>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
index 018cfade2..66532865c 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml
@@ -24,7 +24,7 @@
                 </c:when>
                 <c:otherwise>
                     <li class="breadcrumb-item active">
-                        #{AdminMessages.getMessage('categories.edit.breadcrumb', CategoryDetailsModel.name)}
+                        #{AdminMessages.getMessage('categories.edit.breadcrumb', [ CategoryDetailsModel.name ])}
                     </li>
                 </c:otherwise>
             </c:choose>
@@ -35,44 +35,49 @@
                 <h1>
                     <c:choose>
                         <c:when test="#{CategoryDetailsModel.new}">
-                            #{AdminMessage.getMessage('categories.new.label', CategoryDetailsModel.parent.path)}
+                            #{AdminMessage.getMessage('categories.new.label', [ CategoryDetailsModel.parent.path ])}
                         </c:when>
                         <c:otherwise>
-                            #{AdminMessage.getMessage('categories.edit.label', CategoryDetailsModel.path)}
+                            #{AdminMessage.getMessage('categories.edit.label', [ CategoryDetailsModel.path ])}
                         </c:otherwise>
                     </c:choose>
                     #{AdminMessages['categories.label']}
                 </h1>
 
-                <form action="#{CategoryDetailsModel.new ? mvc.uri('CategoryFormController#createCategory', {'parentCategoryIdentifier', CategoryDetailsModel.parentCategory.identifier }) : mvc.uri('CategoryFormController#updateCategory', {'categoryIdentifier', CategoryDetailsModel.identifier })}" 
+                <form action="#{CategoryDetailsModel.new ? mvc.uri('CategoryFormController#createCategory', {'parentCategoryIdentifier': CategoryDetailsModel.parentCategory.identifier }) : mvc.uri('CategoryFormController#updateCategory', {'categoryIdentifier': CategoryDetailsModel.identifier })}" 
                       method="post">
                     <bootstrap:formGroupText help="#{AdminMessages['categories.form.name.help']}" 
                                              inputId="name" 
                                              label="#{AdminMessages['categories.form.name.label']}" 
                                              name="name" 
                                              pattern="[\\w-.]*"
-                                             required="true" />
+                                             required="true"
+                                             value="#{CategoryDetailsModel.name}" />
                     <bootstrap:formGroupText help="#{AdminMessages['categories.form.uniqueId.help']}" 
                                              inputId="uniqueId" 
                                              label="#{AdminMessages['categories.form.uniqueId.label']}" 
                                              name="uniqueId" 
-                                             required="false" />
+                                             required="false" 
+                                             value="#{CategoryDetailsModel.uniqueId}" />
                     <bootstrap:formCheck label="#{AdminMessages['categories.form.enabled.label']}"
                                          inputId="enabled"
-                                         name="enabled" />
+                                         name="enabled" 
+                                         value="#{CategoryDetailsModel.new ? true : CategoryDetailsModel.enabled}" />
                     <bootstrap:formCheck label="#{AdminMessages['categories.form.visible.label']}"
                                          inputId="visible"
-                                         name="visible" />
+                                         name="visible"
+                                         value="#{CategoryDetailsModel.new ? true : CategoryDetailsModel.visible}"/>
                     <bootstrap:formCheck label="#{AdminMessages['categories.form.abstractCategory.label']}"
                                          inputId="abstractCategory"
-                                         name="abstractCategory" />
+                                         name="abstractCategory"
+                                         value="#{CategoryDetailsModel.new ? false : CategoryDetailsModel.abstractCategory}" />
                     <a class="btn btn-warning" 
-                       href="#{mvc.uri('CategorySystemsController#getCategorySystems')}">
+                       href="#{mvc.uri('CategoriesController#getCategory', {'categoryIdentifier': CategoryDetailsModel.identifier })}">
                         #{AdminMessages['categories.form.buttons.cancel']}
                     </a>
                     <button class="btn btn-success" type="submit">
                         <c:choose>
-                            <c:when test="#{CategorySystemDetailsModel.new}">
+                            <c:when test="#{CategoryDetailsModel.new}">
                                 #{AdminMessages['categories.form.buttons.create']}
                             </c:when>
                             <c:otherwise>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index 6c4c26824..13bd073c3 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -336,6 +336,9 @@
                                     <th>
                                         #{AdminMessages['categorysystems.details.categories.table.headings.abstract']}
                                     </th>
+                                    <th class="text-center">
+                                        #{AdminMessages['categorysystems.details.categories.table.headings.actions']}
+                                    </th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -380,7 +383,7 @@
                                         <td>
                                             <libreccm:deleteDialog 
                                                 actionTarget="#{mvc.uri('CategoriesController#removeSubCategory', {'categoryIdentifier': category.identifier})}"
-                                                buttonText="#{AdminMeesages['categories.details.subcategories.delete']}"
+                                                buttonText="#{AdminMessages['categories.details.subcategories.delete']}"
                                                 buttonTextClass="text-center"
                                                 cancelLabel="#{AdminMessages['categories.details.subcategories.delete.cancel']}"
                                                 confirmLabel="#{AdminMessages['categories.details.subcategories.delete.confirm']}"
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 238be46aa..f5aa457f3 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -397,3 +397,57 @@ categories.details.subcategories.delete.cancel=Cancel
 categories.details.subcategories.delete.confirm=Delete category
 categories.details.subcategories.delete.title=Delete category?
 categories.details.subcategories.delete.message=Are you sure to delete category {0}?
+categories.details.path=Path
+categories.details.id=ID
+categories.details.uuid=UUID
+categories.details.uniqueId=Unique ID
+categories.details.name=Name
+categories.details.title.heading=Localized Title
+categories.details.title.add=Add localized title
+categories.details.title.none=No localized title available
+categories.details.description.heading=Localized description
+categories.details.description.add=Add localized description
+categories.details.description.none=No localized description available
+categories.details.title.add.dialog.close=Cancel
+categories.details.title.add.dialog.locale.help=Select the locale of the localized title
+categories.details.title.add.dialog.locale.label=Locale
+categories.details.title.add.dialog.submit=Add
+categories.details.title.add.dialog.title=Add localized title
+categories.details.title.add.dialog.value.help=The localized title
+categories.details.title.add.dialog.value.label=Localized title
+categories.details.title.table.actions.edit=Edit
+categories.details.title.edit.dialog.close=Cancel
+categories.details.title.edit.dialog.submit=Save
+categories.details.title.table.actions.edit.dialog.title=Edit localized title
+categories.details.title.edit.dialog.value.help=The localized title
+categories.details.title.edit.dialog.value.label=Localized title
+categories.details.title.table.actions.remove=Remove
+categories.details.title.remove.dialog.close=Cancel
+categories.details.title.remove.dialog.submit=Remove
+categories.details.title.remove.dialog.message=Are you sure to remove the localized title for the following locale:
+categories.details.title.table.actions.remove.dialog.title=Remove localized title?
+categories.details.title.table.headings.actions=Actions
+categories.details.title.table.headings.locale=Locale
+categories.details.title.table.headings.value=Value
+categories.details.description.add.dialog.close=Cancel
+categories.details.description.add.dialog.locale.help=The locale of the localized description
+categories.details.description.add.dialog.locale.label=Localized description
+categories.details.description.add.dialog.submit=Add
+categories.details.description.add.dialog.title=Add localized description
+categories.details.description.add.dialog.value.help=The localized description
+categories.details.description.add.dialog.value.label=Localized description
+categories.details.description.table.actions.edit=Edit
+categories.details.description.edit.dialog.close=Cancel
+categories.details.description.edit.dialog.submit=Save
+categories.details.description.table.actions.edit.dialog.title=Edit localized description
+categories.details.description.edit.dialog.value.help=The localized description
+categories.details.description.edit.dialog.value.label=Localized description
+categories.details.description.table.actions.remove=Remove
+categories.details.description.remove.dialog.close=Cancel
+categories.details.description.remove.dialog.submit=Remove
+categories.details.description.remove.dialog.message=Are you sure to remove the localized description for the following locale:
+categories.details.description.table.actions.remove.dialog.title=Remove localized description?
+categories.details.description.table.headings.actions=Actions
+categories.details.description.table.headings.locale=Locale
+categories.details.description.table.headings.value=Value
+categorysystems.details.categories.table.headings.actions=Actions
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index a5e561e4a..c4c2f1ffb 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -397,3 +397,57 @@ categories.details.subcategories.delete.cancel=Abbrechen
 categories.details.subcategories.delete.confirm=Kategorie l\u00f6schen
 categories.details.subcategories.delete.title=Kategorie l\u00f6schen?
 categories.details.subcategories.delete.message=Sind Sie sicher, dass Sie die Kategorie {0} l\u00f6schen wollen?
+categories.details.path=Pfad
+categories.details.id=ID
+categories.details.uuid=UUID
+categories.details.uniqueId=Eindeutige ID
+categories.details.name=Name
+categories.details.title.heading=Lokalisierter Titel
+categories.details.title.add=Lokalisierten Titel hinzuf\u00fcgen
+categories.details.title.none=Keine lokalisierten Titel vorhanden
+categories.details.description.heading=Lokalisierte Beschreibung
+categories.details.description.add=Lokalisierte Beschreibung hinzuf\u00fcgen
+categories.details.description.none=Keine lokalisierte Beschreibung vorhanden
+categories.details.title.add.dialog.close=Abbrechen
+categories.details.title.add.dialog.locale.help=W\u00e4hlen Sie die Sprache des lokalisierten Titels
+categories.details.title.add.dialog.locale.label=Sprache
+categories.details.title.add.dialog.submit=Hinzuf\u00fcgen
+categories.details.title.add.dialog.title=Lokalisierten Titel hinzuf\u00fcgen
+categories.details.title.add.dialog.value.help=Der lokalisierte Titel
+categories.details.title.add.dialog.value.label=Lokalisierter Titel
+categories.details.title.table.actions.edit=Bearbeiten
+categories.details.title.edit.dialog.close=Abbrechen
+categories.details.title.edit.dialog.submit=Speichern
+categories.details.title.table.actions.edit.dialog.title=Lokalisierten Titel bearbeiten
+categories.details.title.edit.dialog.value.help=Der lokalisierte Titel
+categories.details.title.edit.dialog.value.label=Lokalisierter Titel
+categories.details.title.table.actions.remove=Entfernen
+categories.details.title.remove.dialog.close=Abbrechen
+categories.details.title.remove.dialog.submit=Entfernen
+categories.details.title.remove.dialog.message=Sind Sie sicher, dass die den lokalisierten Titlel f\u00fcr die folgende Sprache entfernen wollen:
+categories.details.title.table.actions.remove.dialog.title=Lokalisierten Titel entfernen?
+categories.details.title.table.headings.actions=Aktionen
+categories.details.title.table.headings.locale=Sprache
+categories.details.title.table.headings.value=Wert
+categories.details.description.add.dialog.close=Abbrechen
+categories.details.description.add.dialog.locale.help=Die Sprache der lokalisierten Beschreibung
+categories.details.description.add.dialog.locale.label=Lokalisierte Beschreibung
+categories.details.description.add.dialog.submit=Hinzuf\u00fcgen
+categories.details.description.add.dialog.title=Lokalisierte Beschreibung hinzuf\u00fcgen
+categories.details.description.add.dialog.value.help=Die lokalisierte Beschreibung
+categories.details.description.add.dialog.value.label=Localized description
+categories.details.description.table.actions.edit=Bearbeiten
+categories.details.description.edit.dialog.close=Abbrechen
+categories.details.description.edit.dialog.submit=Speichern
+categories.details.description.table.actions.edit.dialog.title=Lokalisierte Beschreibung bearbeiten
+categories.details.description.edit.dialog.value.help=Die lokalisierte Beschreibung
+categories.details.description.edit.dialog.value.label=Lokalisierte Beschreibung
+categories.details.description.table.actions.remove=Entfernen
+categories.details.description.remove.dialog.close=Abbrechen
+categories.details.description.remove.dialog.submit=Entfernen
+categories.details.description.remove.dialog.message=Sind Sie sicher, dass Sie die lokalisierte Beschreibung f\u00fcr die folgende Sprache entfernen wollen:
+categories.details.description.table.actions.remove.dialog.title=Lokalisierte Beschreibung entfernen?
+categories.details.description.table.headings.actions=Aktionen
+categories.details.description.table.headings.locale=Sprache
+categories.details.description.table.headings.value=Wert
+categorysystems.details.categories.table.headings.actions=Aktionen

From a202973bc67c525338aa96217ebd6a6d4b41448f Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 22 Nov 2020 10:43:46 +0100
Subject: [PATCH 70/93] Set default encoding for FormParams to UTF-8

---
 .../src/main/webapp/WEB-INF/jboss-web.xml                     | 1 +
 ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml      | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml
index 3b2f84d32..5cf554701 100644
--- a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
 <jboss-web>
     <context-root>/libreccm</context-root>
+    <default-encoding>UTF-8</default-encoding>
 </jboss-web>
diff --git a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml
index a42350b9f..a3c67e4f7 100644
--- a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml
+++ b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/web.xml
@@ -69,6 +69,10 @@
         <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
         <param-value>true</param-value>
     </context-param>
+    <context-param>
+        <param-name>PARAMETER_ENCODING</param-name>
+        <param-value>UTF-8</param-value>
+    </context-param>
     
     <!--    <servlet>
         <servlet-name>vaadin-servlet</servlet-name>

From 6e7b6b8dd814649faed7ea554dc2572e2d374fba Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 22 Nov 2020 10:46:11 +0100
Subject: [PATCH 71/93] Finishing UI for category management

---
 .../categories/CategoriesController.java      | 122 +++++++++++++++++-
 .../categories/CategoryFormController.java    |   6 +-
 .../admin/categories/category-details.xhtml   |  35 ++++-
 .../categories/categorysystem-details.xhtml   |  32 ++++-
 .../org/libreccm/ui/AdminBundle.properties    |   4 +
 .../org/libreccm/ui/AdminBundle_de.properties |   4 +
 6 files changed, 193 insertions(+), 10 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
index 794122db0..b970811af 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
@@ -23,6 +23,8 @@ import org.libreccm.api.IdentifierParser;
 import org.libreccm.categorization.Category;
 import org.libreccm.categorization.CategoryManager;
 import org.libreccm.categorization.CategoryRepository;
+import org.libreccm.categorization.Domain;
+import org.libreccm.categorization.DomainRepository;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
@@ -30,8 +32,6 @@ import org.libreccm.ui.Message;
 import org.libreccm.ui.MessageType;
 import org.libreccm.ui.admin.AdminMessages;
 
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.Optional;
@@ -40,16 +40,13 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
-import javax.servlet.http.HttpServletRequest;
 import javax.transaction.Transactional;
 import javax.ws.rs.Consumes;
-import javax.ws.rs.Encoded;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
 /**
@@ -73,6 +70,9 @@ public class CategoriesController {
     @Inject
     private CategoryRepository categoryRepository;
 
+    @Inject
+    private DomainRepository domainRepository;
+    
     @Inject
     private IdentifierParser identifierParser;
 
@@ -635,4 +635,116 @@ public class CategoriesController {
         }
     }
 
+    @POST
+    @Path("/{categoryIdentifier}/subcategories/{subCategoryIdentifier}/reorder")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String reorderSubCategory(
+        @PathParam("categoryIdentifier") final String categoryIdentifierParam,
+        @PathParam("subCategoryIdentifier") final String subCategoryIdentifierParam,
+        @FormParam("direction") final String direction
+    ) {
+        final Identifier categoryIdentifier = identifierParser.parseIdentifier(
+            categoryIdentifierParam
+        );
+        final Identifier subCategoryIdentifier = identifierParser
+            .parseIdentifier(subCategoryIdentifierParam);
+
+        final Optional<Category> categoryResult;
+        switch (categoryIdentifier.getType()) {
+            case ID:
+                categoryResult = categoryRepository.findById(
+                    Long.parseLong(categoryIdentifier.getIdentifier())
+                );
+                break;
+            default:
+                categoryResult = categoryRepository.findByUuid(
+                    categoryIdentifier.getIdentifier()
+                );
+                break;
+        }
+        final Category category;
+        if (categoryResult.isPresent()) {
+            category = categoryResult.get();
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(categoryIdentifierParam)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
+
+        final Optional<Category> subCategoryResult;
+        switch (subCategoryIdentifier.getType()) {
+            case ID:
+                subCategoryResult = categoryRepository.findById(
+                    Long.parseLong(subCategoryIdentifier.getIdentifier())
+                );
+                break;
+            default:
+                subCategoryResult = categoryRepository.findByUuid(
+                    subCategoryIdentifier.getIdentifier()
+                );
+                break;
+        }
+        final Category subCategory;
+        if (subCategoryResult.isPresent()) {
+            subCategory = subCategoryResult.get();
+        } else {
+            categoryDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "categories.not_found.message",
+                        Arrays.asList(subCategoryIdentifierParam)
+                    ), MessageType.WARNING
+                )
+            );
+            return "org/libreccm/ui/admin/categories/category-not-found.xhtml";
+        }
+
+        switch (direction) {
+            case "DECREASE":
+                categoryManager.decreaseCategoryOrder(subCategory, category);
+                break;
+            case "INCREASE":
+                categoryManager.increaseCategoryOrder(subCategory, category);
+                break;
+            default:
+                categoryDetailsModel.addMessage(
+                    new Message(
+                        adminMessages.getMessage(
+                            "categories.invalid_direction.message",
+                            Arrays.asList(direction)),
+                        MessageType.WARNING
+                    )
+                );
+        }
+        
+        if (category.getParentCategory() == null) {
+            final Optional<Domain> categorySystem = domainRepository
+                .findByRootCategory(category);
+            if (categorySystem.isPresent()) {
+                return String.format(
+                    "redirect:categorymanager/categorysystems/ID-%d/details",
+                    categorySystem.get().getObjectId()
+                );
+            } else {
+                return String.format(
+                    "redirect:categorymanager/categories/ID-%d", 
+                    category.getObjectId()
+                );
+            }
+        } else {
+            return String.format(
+                "redirect:categorymanager/categories/ID-%d",
+                category.getObjectId()
+            );
+        }
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
index 36e88016f..7582cca52 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
@@ -135,13 +135,13 @@ public class CategoryFormController {
                     );
                 } else {
                     return String.format(
-                    "redirect:categorymanager/categories/ID-%d/details",
+                    "redirect:categorymanager/categories/ID-%d",
                     parentCategory.getObjectId()
                 );
                 }
             } else {
                 return String.format(
-                    "redirect:categorymanager/categories/ID-%d/details",
+                    "redirect:categorymanager/categories/ID-%d",
                     parentCategory.getObjectId()
                 );
             }
@@ -197,7 +197,7 @@ public class CategoryFormController {
             categoryRepository.save(category);
 
             return String.format(
-                "redirect:categorymanager/categories/ID-%s",
+                "redirect:categorymanager/categories/ID-%d",
                 category.getObjectId()
             );
         } else {
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
index d9e039a18..aa3dafd87 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-details.xhtml
@@ -208,6 +208,9 @@
                                     <th>
                                         #{AdminMessages['categories.details.subcategories.table.headings.abstract']}
                                     </th>
+                                    <th class="text-center" colspan="3">
+                                        #{AdminMessages['categories.details.subcategories.table.headings.actions']}
+                                    </th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -249,6 +252,36 @@
                                                 </c:otherwise>
                                             </c:choose>
                                         </td>
+                                        <td>
+                                            <c:if test="#{category.categoryOrder != 1}">
+                                                <form action="#{mvc.uri('CategoriesController#reorderSubCategory', {'categoryIdentifier': CategoryDetailsModel.identifier, 'subCategoryIdentifier': category.identifier})}"
+                                                      method="post">
+                                                    <input name="direction" 
+                                                           value="DECREASE"
+                                                           type="hidden" />
+                                                    <button class="btn btn-info"
+                                                            type="submit">
+                                                        <bootstrap:svgIcon icon="caret-up-fill" />
+                                                        <span class="sr-only">#{AdminMessages['categories.details.subcategories.reorder.decrease']}</span>
+                                                    </button>
+                                                </form>
+                                            </c:if>
+                                        </td>
+                                        <td>
+                                            <c:if test="#{category.categoryOrder lt CategoryDetailsModel.subCategories.size()}">
+                                                <form action="#{mvc.uri('CategoriesController#reorderSubCategory', {'categoryIdentifier': CategoryDetailsModel.identifier, 'subCategoryIdentifier': category.identifier})}"
+                                                      method="post">
+                                                    <input name="direction" 
+                                                           value="INCREASE"
+                                                           type="hidden" />
+                                                    <button class="btn btn-info"
+                                                            type="submit">
+                                                        <bootstrap:svgIcon icon="caret-down-fill" />
+                                                        <span class="sr-only">#{AdminMessages['categories.details.subcategories.reorder.increase']}</span>
+                                                    </button>
+                                                </form>
+                                            </c:if>
+                                        </td>
                                         <td>
                                             <libreccm:deleteDialog 
                                                 actionTarget="#{mvc.uri('CategoriesController#removeSubCategory', {'categoryIdentifier': category.identifier})}"
@@ -267,7 +300,7 @@
                         </table>
                     </c:otherwise>
                 </c:choose>
-                
+
             </div>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index 13bd073c3..5d32e6eb2 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -336,7 +336,7 @@
                                     <th>
                                         #{AdminMessages['categorysystems.details.categories.table.headings.abstract']}
                                     </th>
-                                    <th class="text-center">
+                                    <th class="text-center" colspan="3">
                                         #{AdminMessages['categorysystems.details.categories.table.headings.actions']}
                                     </th>
                                 </tr>
@@ -380,6 +380,36 @@
                                                 </c:otherwise>
                                             </c:choose>
                                         </td>
+                                        <td>
+                                            <c:if test="#{category.categoryOrder != 0}">
+                                                <form action="#{mvc.uri('CategoriesController#reorderSubCategory', {'categoryIdentifier': CategorySystemDetailsModel.rootIdentifier, 'subCategoryIdentifier': category.identifier})}"
+                                                      method="post">
+                                                    <input name="direction"
+                                                           type="hidden"
+                                                           value="DECREASE" />
+                                                    <button class="btn btn-info"
+                                                            type="submit">
+                                                        <bootstrap:svgIcon icon="caret-up-fill" />
+                                                        <span class="sr-only">#{AdminMessages['categories.details.subcategories.reorder.decrease']}</span>
+                                                    </button>
+                                                </form>
+                                            </c:if>
+                                        </td>
+                                        <td>
+                                            <c:if test="#{category.categoryOrder lt CategorySystemDetailsModel.categories.size()}">
+                                                <form action="#{mvc.uri('CategoriesController#reorderSubCategory', {'categoryIdentifier': CategorySystemDetailsModel.rootIdentifier, 'subCategoryIdentifier': category.identifier})}"
+                                                      method="post">
+                                                    <input name="direction" 
+                                                           value="INCREASE" 
+                                                           type="hidden" />
+                                                    <button class="btn btn-info"
+                                                            type="submit">
+                                                        <bootstrap:svgIcon icon="caret-down-fill" />
+                                                        <span class="sr-only">#{AdminMessages['categories.details.subcategories.reorder.increase']}</span>
+                                                    </button>
+                                                </form>
+                                            </c:if>
+                                        </td>
                                         <td>
                                             <libreccm:deleteDialog 
                                                 actionTarget="#{mvc.uri('CategoriesController#removeSubCategory', {'categoryIdentifier': category.identifier})}"
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index f5aa457f3..20a15cb17 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -451,3 +451,7 @@ categories.details.description.table.headings.actions=Actions
 categories.details.description.table.headings.locale=Locale
 categories.details.description.table.headings.value=Value
 categorysystems.details.categories.table.headings.actions=Actions
+categories.invalid_direction.message=Invalid direction {0}. Valid direction are: INCREASE, DECREASE
+categories.details.subcategories.table.headings.actions=Actions
+categories.details.subcategories.reorder.decrease=Move up
+categories.details.subcategories.reorder.increase=Move down
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index c4c2f1ffb..f6dc1d3f3 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -451,3 +451,7 @@ categories.details.description.table.headings.actions=Aktionen
 categories.details.description.table.headings.locale=Sprache
 categories.details.description.table.headings.value=Wert
 categorysystems.details.categories.table.headings.actions=Aktionen
+categories.invalid_direction.message=Ung\u00fcltiger Wert {0} f\u00fcr Parameter direction. G\u00fcltige Werte: INCREASE, DECREASE
+categories.details.subcategories.table.headings.actions=Aktionen
+categories.details.subcategories.reorder.decrease=Hoch
+categories.details.subcategories.reorder.increase=Runter

From eff00734371c1578165dde7d0ceb60ac9c6881e0 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 22 Nov 2020 15:44:15 +0100
Subject: [PATCH 72/93] FileSystemThemeProvider: Catch exception thrown if
 CcmFiles is not configured, return empty list

---
 .../java/org/libreccm/files/CcmFiles.java     |  9 ++-
 .../files/CcmFilesNotConfiguredException.java | 67 +++++++++++++++++++
 .../theming/FileSystemThemeProvider.java      | 15 ++++-
 .../libreccm/ui/admin/{ => sites}/sites.xhtml |  0
 4 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/files/CcmFilesNotConfiguredException.java
 rename ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/{ => sites}/sites.xhtml (100%)

diff --git a/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java b/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java
index 33a130516..06b635d7b 100644
--- a/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java
+++ b/ccm-core/src/main/java/org/libreccm/files/CcmFiles.java
@@ -172,9 +172,10 @@ public class CcmFiles {
             if (adapter.isConfigured()) {
                 return adapter;
             } else {
-                throw new UnexpectedErrorException(
+                throw new CcmFilesNotConfiguredException(
                     "Only the default FileSystemAdapter is available but is "
-                        + "not correctly configured.");
+                        + "not correctly configured."
+                );
             }
         }
     }
@@ -196,7 +197,9 @@ public class CcmFiles {
         final String dataPath = filesConf.getDataPath();
 
         if (dataPath == null || dataPath.trim().isEmpty()) {
-            throw new UnexpectedErrorException("dataPath is not configured.");
+            throw new CcmFilesNotConfiguredException(
+                "dataPath is not configured."
+            );
         }
 
         if (dataPath.endsWith("/")) {
diff --git a/ccm-core/src/main/java/org/libreccm/files/CcmFilesNotConfiguredException.java b/ccm-core/src/main/java/org/libreccm/files/CcmFilesNotConfiguredException.java
new file mode 100644
index 000000000..ad77ded70
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/files/CcmFilesNotConfiguredException.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+
+package org.libreccm.files;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class CcmFilesNotConfiguredException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new instance of <code>CcmFilesNotConfiguredException</code> without detail message.
+     */
+    public CcmFilesNotConfiguredException() {
+        super();
+    }
+
+
+    /**
+     * Constructs an instance of <code>CcmFilesNotConfiguredException</code> with the specified detail message.
+     *
+     * @param msg The detail message.
+     */
+    public CcmFilesNotConfiguredException(final String msg) {
+        super(msg);
+    }
+
+    /**
+      * Constructs an instance of <code>CcmFilesNotConfiguredException</code> which wraps the 
+      * specified exception.
+      *
+      * @param exception The exception to wrap.
+      */
+    public CcmFilesNotConfiguredException(final Exception exception) {
+        super(exception);
+    }
+
+    /**
+      * Constructs an instance of <code>CcmFilesNotConfiguredException</code> with the specified message which also wraps the 
+      * specified exception.
+      *
+      * @param msg The detail message.
+      * @param exception The exception to wrap.
+      */
+    public CcmFilesNotConfiguredException(final String msg, final Exception exception) {
+        super(msg, exception);
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/theming/FileSystemThemeProvider.java b/ccm-core/src/main/java/org/libreccm/theming/FileSystemThemeProvider.java
index b66210d5f..7a3c1b3ce 100644
--- a/ccm-core/src/main/java/org/libreccm/theming/FileSystemThemeProvider.java
+++ b/ccm-core/src/main/java/org/libreccm/theming/FileSystemThemeProvider.java
@@ -18,8 +18,11 @@
  */
 package org.libreccm.theming;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.libreccm.core.UnexpectedErrorException;
 import org.libreccm.files.CcmFiles;
+import org.libreccm.files.CcmFilesNotConfiguredException;
 import org.libreccm.files.DirectoryNotEmptyException;
 import org.libreccm.files.FileAccessException;
 import org.libreccm.files.FileAlreadyExistsException;
@@ -53,6 +56,10 @@ import javax.inject.Inject;
 public class FileSystemThemeProvider implements ThemeProvider {
 
     private static final long serialVersionUID = 1L;
+    
+    private static final Logger LOGGER = LogManager.getLogger(
+        FileSystemThemeProvider.class
+    );
 
     private static final String BASE_PATH = "/themes";
     private static final String DRAFT_THEMES_PATH = BASE_PATH + "/draft";
@@ -74,7 +81,6 @@ public class FileSystemThemeProvider implements ThemeProvider {
     public List<ThemeInfo> getThemes() {
 
         try {
-
             if (!ccmFiles.isDirectory(BASE_PATH)
                     || !ccmFiles.isDirectory(DRAFT_THEMES_PATH)) {
 
@@ -92,8 +98,10 @@ public class FileSystemThemeProvider implements ThemeProvider {
         } catch (FileAccessException
                      | FileDoesNotExistException
                      | InsufficientPermissionsException ex) {
-
             throw new UnexpectedErrorException(ex);
+        } catch(CcmFilesNotConfiguredException ex) {
+            LOGGER.warn(ex);
+            return Collections.emptyList();
         }
     }
 
@@ -119,6 +127,9 @@ public class FileSystemThemeProvider implements ThemeProvider {
                      | InsufficientPermissionsException ex) {
 
             throw new UnexpectedErrorException(ex);
+        } catch(CcmFilesNotConfiguredException ex) {
+            LOGGER.warn(ex);
+            return Collections.emptyList();
         }
     }
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/sites.xhtml
similarity index 100%
rename from ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites.xhtml
rename to ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/sites.xhtml

From 82974ede3a12347aaabdb2760e95a428ca61802f Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 22 Nov 2020 15:45:16 +0100
Subject: [PATCH 73/93] UI for Sites Management

---
 .../main/java/org/libreccm/sites/Site.java    |   4 +
 .../libreccm/sites/SiteAwareApplication.java  |   5 +-
 .../org/libreccm/sites/SiteRepository.java    |  24 ++-
 .../ui/admin/sites/SiteDetailsModel.java      | 121 +++++++++++
 .../ui/admin/sites/SiteFormController.java    | 160 ++++++++++++++
 .../libreccm/ui/admin/sites/SiteTableRow.java |  81 +++++++
 .../ui/admin/sites/SitesController.java       | 201 +++++++++++++++++-
 .../libreccm/ui/admin/sites/SitesPage.java    |   1 +
 .../components/libreccm/deleteDialog.xhtml    |   1 +
 .../ui/admin/sites/site-details.xhtml         |  67 ++++++
 .../libreccm/ui/admin/sites/site-form.xhtml   |  87 ++++++++
 .../ui/admin/sites/site-not-found.xhtml       |  30 +++
 .../org/libreccm/ui/admin/sites/sites.xhtml   |  61 +++++-
 .../org/libreccm/ui/AdminBundle.properties    |  35 +++
 .../org/libreccm/ui/AdminBundle_de.properties |  35 +++
 15 files changed, 908 insertions(+), 5 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteDetailsModel.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteFormController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteTableRow.java
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-details.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-form.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-not-found.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/sites/Site.java b/ccm-core/src/main/java/org/libreccm/sites/Site.java
index e0559bdd1..7799af838 100644
--- a/ccm-core/src/main/java/org/libreccm/sites/Site.java
+++ b/ccm-core/src/main/java/org/libreccm/sites/Site.java
@@ -44,6 +44,10 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "SITES", schema = DB_SCHEMA)
 @NamedQueries({
+    @NamedQuery(
+        name = "Site.findByUuid",
+        query = "SELECT s FROM Site s WHERE s.uuid = :uuid"
+    ),
     @NamedQuery(
         name = "Site.findByDomain",
         query = "SELECT s FROM Site s "
diff --git a/ccm-core/src/main/java/org/libreccm/sites/SiteAwareApplication.java b/ccm-core/src/main/java/org/libreccm/sites/SiteAwareApplication.java
index 0cb9e6f6c..d91544d4d 100644
--- a/ccm-core/src/main/java/org/libreccm/sites/SiteAwareApplication.java
+++ b/ccm-core/src/main/java/org/libreccm/sites/SiteAwareApplication.java
@@ -67,7 +67,7 @@ public class SiteAwareApplication extends CcmApplication {
 
     @Override
     public int hashCode() {
-        int hash = 3;
+        int hash = super.hashCode();
         if (site != null) {
             hash = 59 * hash + Objects.hashCode(site.getDomainOfSite());
             hash = 59 * hash + Objects.hashCode(site.isDefaultSite());
@@ -84,6 +84,9 @@ public class SiteAwareApplication extends CcmApplication {
         if (obj == null) {
             return false;
         }
+        if (!super.equals(obj)) {
+            return false;
+        }
         if (!(obj instanceof SiteAwareApplication)) {
             return false;
         }
diff --git a/ccm-core/src/main/java/org/libreccm/sites/SiteRepository.java b/ccm-core/src/main/java/org/libreccm/sites/SiteRepository.java
index 81389faa3..fb646c3e5 100644
--- a/ccm-core/src/main/java/org/libreccm/sites/SiteRepository.java
+++ b/ccm-core/src/main/java/org/libreccm/sites/SiteRepository.java
@@ -41,6 +41,28 @@ public class SiteRepository extends AbstractEntityRepository<Long, Site> {
 
     private static final long serialVersionUID = 3120528987720524155L;
 
+    /**
+     * Retrieve a {@link Site} by its UUID.
+     *
+     * @param uuid The UUID of the site.
+     *
+     * @return An {@link Optional} containing the {@link Site} if a site for the
+     *         provided UUID exists.
+     */
+    @Transactional(Transactional.TxType.REQUIRED)
+    public Optional<Site> findByUuid(final String uuid) {
+        try {
+            return Optional.of(
+                getEntityManager()
+                    .createNamedQuery("Site.findByUuid", Site.class)
+                    .setParameter("uuid", uuid)
+                    .getSingleResult()
+            );
+        } catch (NoResultException ex) {
+            return Optional.empty();
+        }
+    }
+
     /**
      * Retrieve the {@link Site} for a specific domain.
      *
@@ -127,7 +149,7 @@ public class SiteRepository extends AbstractEntityRepository<Long, Site> {
     public String getIdAttributeName() {
         return "objectId";
     }
-    
+
     @Override
     public Long getIdOfEntity(final Site entity) {
         return entity.getObjectId();
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteDetailsModel.java
new file mode 100644
index 000000000..60fd9b9d1
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteDetailsModel.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.sites;
+
+import org.libreccm.sites.Site;
+import org.libreccm.theming.ThemeInfo;
+import org.libreccm.ui.Message;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("SiteDetailsModel")
+public class SiteDetailsModel {
+
+    private long siteId;
+
+    private String uuid;
+
+    private String identifier;
+
+    private String domain;
+
+    private boolean defaultSite;
+
+    private String defaultTheme;
+
+    private Map<String, String> availableThemes;
+
+    private List<Message> messages;
+
+    public long getSiteId() {
+        return siteId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public boolean isNew() {
+        return siteId == 0;
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public boolean isDefaultSite() {
+        return defaultSite;
+    }
+
+    public String getDefaultTheme() {
+        return defaultTheme;
+    }
+
+    public Map<String, String> getAvailableThemes() {
+        return Collections.unmodifiableMap(availableThemes);
+    }
+
+    public List<Message> getMessages() {
+        return Collections.unmodifiableList(messages);
+    }
+
+    protected void addMessage(final Message message) {
+        messages.add(message);
+    }
+
+    protected void setSite(final Site site) {
+        Objects.requireNonNull(site);
+
+        siteId = site.getObjectId();
+        uuid = site.getUuid();
+        identifier = String.format("ID-%d", siteId);
+        domain = site.getDomainOfSite();
+        defaultSite = site.isDefaultSite();
+        defaultTheme = site.getDefaultTheme();
+    }
+
+    protected void setAvailableThemes(final List<ThemeInfo> availableThemes) {
+        this.availableThemes = availableThemes
+            .stream()
+            .collect(
+                Collectors.toMap(
+                    themeInfo -> themeInfo.getName(),
+                    themeInfo -> themeInfo.getName()
+                )
+            );
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteFormController.java
new file mode 100644
index 000000000..a99e8fd03
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteFormController.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.sites;
+
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.sites.Site;
+import org.libreccm.sites.SiteRepository;
+import org.libreccm.ui.Message;
+import org.libreccm.ui.MessageType;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/sites")
+public class SiteFormController {
+
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private SiteDetailsModel siteDetailsModel;
+
+    @Inject
+    private SiteRepository siteRepository;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @FormParam("domain")
+    private String domainOfSite;
+
+    @FormParam("defaultSite")
+    private String defaultSite;
+
+    @FormParam("defaultTheme")
+    private String defaultTheme;
+
+    @POST
+    @Path("/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String createSite() {
+        final Site site = new Site();
+        site.setDomainOfSite(domainOfSite);
+        if (defaultSite != null) {
+            resetDefaultSite();
+            site.setDefaultSite(true);
+        }
+        site.setDefaultTheme(defaultTheme);
+
+        siteRepository.save(site);
+
+        return "redirect:sites";
+    }
+
+    @POST
+    @Path("/{siteIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateSite(
+        @PathParam("siteIdentifier") final String siteIdentifierParam
+    ) {
+        final Identifier siteIdentifier = identifierParser.parseIdentifier(
+            siteIdentifierParam
+        );
+
+        final Optional<Site> result;
+        switch (siteIdentifier.getType()) {
+            case ID:
+                result = siteRepository.findById(
+                    Long.parseLong(siteIdentifier.getIdentifier())
+                );
+                break;
+            default:
+                result = siteRepository.findByUuid(
+                    siteIdentifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            final Site site = result.get();
+
+            site.setDomainOfSite(domainOfSite);
+            site.setDefaultTheme(defaultTheme);
+
+            final boolean isDefaultSite = defaultSite != null;
+            if (isDefaultSite != site.isDefaultSite()) {
+                resetDefaultSite();
+                site.setDefaultSite(isDefaultSite);
+            }
+            siteRepository.save(site);
+
+            return String.format(
+                "redirect:sites/ID-%d/details", site.getObjectId()
+            );
+        } else {
+            siteDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "sites.not_found_message",
+                        Arrays.asList(siteIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+
+            return "org/libreccm/ui/admin/sites/site-not-found.xhtml";
+        }
+    }
+
+    private void resetDefaultSite() {
+        final Optional<Site> result = siteRepository
+            .findDefaultSite();
+        if (result.isPresent()) {
+            final Site site = result.get();
+            site.setDefaultSite(false);
+            siteRepository.save(site);
+        }
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteTableRow.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteTableRow.java
new file mode 100644
index 000000000..1c4df5c8a
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteTableRow.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.sites;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class SiteTableRow {
+
+    private long siteId;
+
+    private String uuid;
+
+    private String domain;
+
+    private boolean defaultSite;
+
+    private String defaultTheme;
+
+    public long getSiteId() {
+        return siteId;
+    }
+
+    protected void setSiteId(final long siteId) {
+        this.siteId = siteId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    protected void setUuid(final String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getIdentifier() {
+        return String.format("ID-%d", siteId);
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    protected void setDomain(final String domain) {
+        this.domain = domain;
+    }
+
+    public boolean isDefaultSite() {
+        return defaultSite;
+    }
+
+    protected void setDefaultSite(final boolean defaultSite) {
+        this.defaultSite = defaultSite;
+    }
+
+    public String getDefaultTheme() {
+        return defaultTheme;
+    }
+
+    protected void setDefaultTheme(final String defaultTheme) {
+        this.defaultTheme = defaultTheme;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
index e7bd0a708..1d84fc313 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
@@ -18,14 +18,33 @@
  */
 package org.libreccm.ui.admin.sites;
 
+import org.libreccm.api.Identifier;
+import org.libreccm.api.IdentifierParser;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.sites.Site;
+import org.libreccm.sites.SiteRepository;
+import org.libreccm.theming.Themes;
+import org.libreccm.ui.Message;
+import org.libreccm.ui.MessageType;
+import org.libreccm.ui.admin.AdminMessages;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 
 /**
  *
@@ -35,12 +54,190 @@ import javax.ws.rs.Path;
 @Controller
 @Path("/sites")
 public class SitesController {
-    
+
+    @Inject
+    private AdminMessages adminMessages;
+
+    @Inject
+    private IdentifierParser identifierParser;
+
+    @Inject
+    private Models models;
+
+    @Inject
+    private SiteDetailsModel siteDetailsModel;
+
+    @Inject
+    private SiteRepository siteRepository;
+
+    @Inject
+    private Themes themes;
+
     @GET
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String getSites() {
-        return "org/libreccm/ui/admin/sites.xhtml";
+        final List<Site> sites = siteRepository.findAll();
+        models.put(
+            "sites",
+            sites
+                .stream()
+                .map(this::buildSiteTableRow)
+                .collect(Collectors.toList())
+        );
+
+        return "org/libreccm/ui/admin/sites/sites.xhtml";
     }
+
+    @GET
+    @Path("/{siteIdentifier}/details")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String getSite(
+        @PathParam("siteIdentifier") final String siteIdentifierParam
+    ) {
+        final Identifier siteIdentifier = identifierParser.parseIdentifier(
+            siteIdentifierParam
+        );
+
+        final Optional<Site> result;
+        switch (siteIdentifier.getType()) {
+            case ID:
+                result = siteRepository.findById(
+                    Long.parseLong(siteIdentifier.getIdentifier())
+                );
+                break;
+            default:
+                result = siteRepository.findByUuid(
+                    siteIdentifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            siteDetailsModel.setSite(result.get());
+            siteDetailsModel.setAvailableThemes(themes.getAvailableThemes());
+
+            return "org/libreccm/ui/admin/sites/site-details.xhtml";
+        } else {
+            siteDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "sites.not_found_message",
+                        Arrays.asList(siteIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+
+            return "org/libreccm/ui/admin/sites/site-not-found.xhtml";
+        }
+    }
+
+    @GET
+    @Path("/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String createNewSite() {
+        siteDetailsModel.setAvailableThemes(themes.getAvailableThemes());
+        return "org/libreccm/ui/admin/sites/site-form.xhtml";
+    }
+
+    @GET
+    @Path("/{siteIdentifier}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String editSite(
+        @PathParam("siteIdentifier") final String siteIdentifierParam
+    ) {
+        final Identifier siteIdentifier = identifierParser.parseIdentifier(
+            siteIdentifierParam
+        );
+
+        final Optional<Site> result;
+        switch (siteIdentifier.getType()) {
+            case ID:
+                result = siteRepository.findById(
+                    Long.parseLong(siteIdentifier.getIdentifier())
+                );
+                break;
+            default:
+                result = siteRepository.findByUuid(
+                    siteIdentifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            siteDetailsModel.setSite(result.get());
+            siteDetailsModel.setAvailableThemes(themes.getAvailableThemes());
+
+            return "org/libreccm/ui/admin/sites/site-form.xhtml";
+        } else {
+            siteDetailsModel.addMessage(
+                new Message(
+                    adminMessages.getMessage(
+                        "sites.not_found_message",
+                        Arrays.asList(siteIdentifierParam)
+                    ),
+                    MessageType.WARNING
+                )
+            );
+
+            return "org/libreccm/ui/admin/sites/site-not-found.xhtml";
+        }
+    }
+    
+    @POST
+    @Path("/{identifier}/delete")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String deleteSite(
+        @PathParam("identifier") final String siteIdentifierParam,
+        @FormParam("confirmed") final String confirmed
+    ) {
+        if ("true".equals(confirmed)) {
+            final Identifier siteIdentifier = identifierParser.parseIdentifier(
+            siteIdentifierParam
+        );
+
+        final Optional<Site> result;
+        switch (siteIdentifier.getType()) {
+            case ID:
+                result = siteRepository.findById(
+                    Long.parseLong(siteIdentifier.getIdentifier())
+                );
+                break;
+            default:
+                result = siteRepository.findByUuid(
+                    siteIdentifier.getIdentifier()
+                );
+                break;
+        }
+
+        if (result.isPresent()) {
+            siteRepository.delete(result.get());
+        }
+        }
+        
+        return "redirect:sites";
+    }
+
+    private SiteTableRow buildSiteTableRow(final Site site) {
+        final SiteTableRow row = new SiteTableRow();
+        row.setSiteId(site.getObjectId());
+        row.setUuid(site.getUuid());
+        row.setDomain(site.getDomainOfSite());
+        row.setDefaultSite(site.isDefaultSite());
+        row.setDefaultTheme(site.getDefaultTheme());
+
+        return row;
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
index a07f98a6f..6ae053284 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
@@ -36,6 +36,7 @@ public class SitesPage implements AdminPage {
     public Set<Class<?>> getControllerClasses() {
         final Set<Class<?>> classes = new HashSet<>();
         classes.add(SitesController.class);
+        classes.add(SiteFormController.class);
         return classes;
     }
 
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml
index c661863db..b70493b87 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/libreccm/deleteDialog.xhtml
@@ -101,6 +101,7 @@
                         </button>
                     </div>
                     <div class="modal-body">
+                        <input name="confirmed" type="hidden" value="true" />
                         <p>
                             #{cc.attrs.message}
                         </p>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-details.xhtml
new file mode 100644
index 000000000..d5e12392e
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-details.xhtml
@@ -0,0 +1,67 @@
+<!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:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="sites" />
+        <ui:param name="title" value="#{AdminMessages['sites.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('SitesController#getSites')}">
+                    #{AdminMessages['sites.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item active">
+                #{SiteDetailsModel.domain}
+            </li>
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages.getMessage('site.details.title', [SiteDetailsModel.domain])}</h1>
+                <libreccm:messages messages="#{CategoryDetailsModel.messages}" />
+
+                <dl>
+                    <div>
+                        <dt>#{AdminMessages['sites.details.domain']}</dt>
+                        <dd>#{SiteDetailsModel.domain}</dd>
+                    </div>
+                    <div>
+                        <dt>#{AdminMessages['sites.details.defaultSite']}</dt>
+                        <dd>
+                            <c:choose>
+                                <c:when test="#{SiteDetailsModel.defaultSite}">
+                                    #{AdminMessages['sites.details.defaultSite.yes']}
+                                </c:when>
+                                <c:otherwise>
+                                    #{AdminMessages['sites.details.defaultSite.no']}
+                                </c:otherwise>
+                            </c:choose>
+                        </dd>
+                    </div>
+                    <div>
+                        <dt>#{AdminMessages['sites.details.defaultTheme']}</dt>
+                        <dd>#{SiteDetailsModel.defaultTheme}</dd>
+                    </div>
+                </dl>
+
+                <div class="mb-4">
+                    <a class="btn btn-primary"
+                       href="#{mvc.uri('SitesController#editSite', {'siteIdentifier': SiteDetailsModel.identifier } )}">
+                        <bootstrap:svgIcon icon="pen" />
+                        <span>#{AdminMessages['site.details.edit']}</span>
+                    </a>
+                </div>
+
+            </div>
+        </ui:define>
+
+    </ui:composition>
+
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-form.xhtml
new file mode 100644
index 000000000..1d06f31e8
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-form.xhtml
@@ -0,0 +1,87 @@
+<!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/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="sites" />
+        <ui:param name="title" value="#{AdminMessages['sites.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('SitesController#getSites')}">
+                    #{AdminMessages['sites.label']}
+                </a>
+            </li>
+            <c:choose>
+                <c:when test="#{SiteDetailsModel.new}">
+                    <li class="breadcrumb-item active">
+                        #{AdminMessages['sites.breadcrumbs.create']}
+                    </li>
+                </c:when>
+                <c:otherwise>
+                    <li class="breadcrumb-item">
+                        <a href="#{mvc.uri('SitesController#getSite', {'siteIdentifier': SiteDetailsModel.identifier })}">
+                            #{SiteDetailsModel.domain}
+                        </a>
+                    </li>
+                    <li class="breadcrumb-item active">
+                        #{AdminMessages['sites.breadcrumbs.edit']}
+                    </li>
+                </c:otherwise>
+            </c:choose>
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container">
+                <h1>
+                    <c:choose>
+                        <c:when test="#{SiteDetailsModel.new}">
+                            #{AdminMessages['sites.create.label']}
+                        </c:when>
+                        <c:otherwise>
+                            #{AdminMessages.getMessage('sites.edit.label', [SiteDetailsModel.domain])}
+                        </c:otherwise>
+                    </c:choose>
+                </h1>
+
+                <form action="#{SiteDetailsModel.new ? mvc.uri('SiteFormController#createSite') : mvc.uri('SiteFormController#updateSite', {'siteIdentifier': SiteDetailsModel.identifier })}"
+                      method="post">
+                    <bootstrap:formGroupText help="#{AdminMessages['sites.form.domain.help']}"
+                                             inputId="domain"
+                                             label="#{AdminMessages['sites.form.domain.label']}"
+                                             name="domain"
+                                             required="true"
+                                             value="#{SiteDetailsModel.domain}" />
+                    <bootstrap:formCheck label="#{AdminMessages['sites.form.defaultsite.label']}"
+                                         inputId="defaultSite"
+                                         name="defaultSite"
+                                         required="false"
+                                         value="#{SiteDetailsModel.defaultSite}" />
+                    <bootstrap:formGroupSelect help="#{AdminMessages['sites.form.defaulttheme.help']}"
+                                               inputId="defaultTheme"
+                                               label="#{AdminMessages['sites.form.defaulttheme.label']}"
+                                               name="defaultTheme"
+                                               options="#{SiteDetailsModel.availableThemes}" />
+                    <a class="btn btn-warning"
+                       href="#{SiteDetailsModel.new ? mvc.uri('SitesController#getSites') : mvc.uri('SitesController#getSite', { 'siteIdentifier': SiteDetailsModel.identifier })}">
+                        #{AdminMessages['sites.form.buttons.cancel']}
+                    </a>
+                    <button class="btn btn-success" type="submit">
+                        <c:choose>
+                            <c:when test="#{SiteDetailsModel.new}">
+                                #{AdminMessages['sites.form.buttons.create']}
+                            </c:when>
+                            <c:otherwise>
+                                #{AdminMessages['sites.form.buttons.save']}
+                            </c:otherwise>
+                        </c:choose>
+                    </button>
+                </form>
+            </div>
+        </ui:define>
+
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-not-found.xhtml
new file mode 100644
index 000000000..e0516e546
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/site-not-found.xhtml
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="categories" />
+        <ui:param name="title" value="#{AdminMessages['categorymanager.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['categorymanager.label']}
+            </li>
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['site.not_found.title']}</h1>
+                <c:forEach items="#{SiteDetailsModel.messages}" var="message">
+                    <div class="alert alert-#{message.messageType}" role="alert">
+                        #{message}
+                    </div>
+                </c:forEach>
+            </div>
+        </ui:define>
+
+    </ui:composition>
+</html>
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/sites.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/sites.xhtml
index 9ed2f5fc9..201cb5c55 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/sites.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/sites/sites.xhtml
@@ -1,7 +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:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
@@ -18,7 +20,64 @@
         <ui:define name="main">
             <div class="container">
                 <h1>#{AdminMessages['sites.label']}</h1>
-                <p>Placeholder</p>
+
+                <div class="mb-2">
+                    <div class="text-right">
+                        <a class="btn btn-secondary"
+                           href="#{mvc.uri('SitesController#createNewSite')}">
+                            <bootstrap:svgIcon icon="plus-circle" />
+                            <span>#{AdminMessages['sites.add_site']}</span>
+                        </a>
+                    </div>
+                </div>
+                <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th>#{AdminMessages['sites.table.heading.domain']}</th>
+                            <th>#{AdminMessages['sites.table.heading.defaultSite']}</th>
+                            <th>#{AdminMessages['sites.table.heading.defaultTheme']}</th>
+                            <th class="text-center" colspan="2">#{AdminMessages['sites.table.heading.actions']}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <c:forEach items="#{sites}" var="site">
+                            <tr>
+                                <td>#{site.domain}</td>
+                                <td>
+                                    <c:choose>
+                                        <c:when test="#{site.defaultSite}">
+                                            #{AdminMessages['sites.table.defaultSite.yes']}
+                                        </c:when>
+                                        <c:otherwise>
+                                            #{AdminMessages['sites.table.defaultSite.no']}
+                                        </c:otherwise>
+                                    </c:choose>
+                                </td>
+                                <td>
+                                    #{site.defaultTheme}
+                                </td>
+                                <td>
+                                    <a class="btn btn-info"
+                                       href="#{mvc.uri('SitesController#getSite', {'siteIdentifier': site.identifier })}">
+                                        <bootstrap:svgIcon icon="pen" />
+                                        <span>
+                                            #{AdminMessages['sites.table.edit']}
+                                        </span>
+                                    </a>
+                                </td>
+                                <td>
+                                    <libreccm:deleteDialog actionTarget="#{mvc.uri('SitesController#deleteSite', {'identifier': site.identifier })}" 
+                                                           buttonText="#{AdminMessages['sites.table.delete']}"
+                                                           cancelLabel="#{AdminMessages['sites.delete_dialog.cancel']}"
+                                                           confirmLabel="#{AdminMessages['sites.delete_dialog.confirm']}"
+                                                           dialogId="delete-site-dialog-#{site.siteId}"
+                                                           dialogTitle="#{AdminMessages['sites.delete_dialog.title']}"
+                                                           message="#{AdminMessages.getMessage('sites.delete_dialog.message', [site.domain])}" />
+                                </td>
+                            </tr>
+                        </c:forEach>
+                    </tbody>
+                </table>
             </div>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 20a15cb17..e022c886e 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -455,3 +455,38 @@ categories.invalid_direction.message=Invalid direction {0}. Valid direction are:
 categories.details.subcategories.table.headings.actions=Actions
 categories.details.subcategories.reorder.decrease=Move up
 categories.details.subcategories.reorder.increase=Move down
+sites.table.heading.domain=Domain
+sites.table.heading.defaultSite=Default site?
+sites.table.heading.defaultTheme=Default Theme
+sites.table.heading.actions=Actions
+sites.table.defaultSite.yes=Yes
+sites.table.defaultSite.no=No
+sites.table.edit=Edit
+sites.table.delete=Delete
+sites.delete_dialog.cancel=Cancel
+sites.delete_dialog.confirm=Delete site
+sites.delete_dialog.title=Confirm to delete site
+sites.delete_dialog.message=Are you sure to delete the site for the domain {0}?
+sites.add_site=Add Site
+site.not_found.title=Site not found
+sites.not_found_message=No site for identifier {0} gefunden.
+site.details.title=Site {0}
+sites.details.domain=Domain
+sites.details.defaultSite=Default Site?
+sites.details.defaultSite.yes=Yes
+sites.details.defaultSite.no=No
+sites.details.defaultTheme=Default Theme
+site.details.edit=Edit
+sites.site.edit.label=Edit
+sites.breadcrumbs.create=Create new site
+sites.breadcrumbs.edit=Edit
+sites.create.label=Create new Site
+sites.edit.label=Edit Site {0}
+sites.form.domain.help=The domain of the site
+sites.form.domain.label=Domain
+sites.form.defaultsite.label=Is default site?
+sites.form.defaulttheme.help=Default theme of the site
+sites.form.defaulttheme.label=Default Theme
+sites.form.buttons.cancel=Cancel
+sites.form.buttons.create=Create Site
+sites.form.buttons.save=Save
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index f6dc1d3f3..c4a803425 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -455,3 +455,38 @@ categories.invalid_direction.message=Ung\u00fcltiger Wert {0} f\u00fcr Parameter
 categories.details.subcategories.table.headings.actions=Aktionen
 categories.details.subcategories.reorder.decrease=Hoch
 categories.details.subcategories.reorder.increase=Runter
+sites.table.heading.domain=Domain
+sites.table.heading.defaultSite=Default site?
+sites.table.heading.defaultTheme=Standard Theme
+sites.table.heading.actions=Aktionen
+sites.table.defaultSite.yes=Ja
+sites.table.defaultSite.no=Nein
+sites.table.edit=Bearbeiten
+sites.table.delete=L\u00f6schen
+sites.delete_dialog.cancel=Abbrechen
+sites.delete_dialog.confirm=Site l\u00f6schen
+sites.delete_dialog.title=L\u00f6schen der Site best\u00e4tigen
+sites.delete_dialog.message=Sind Sie sicher, dass Sie die Site f\u00fcr die Domain {0} l\u00f6schen wollen?
+sites.add_site=Site hinzuf\u00fcgen
+site.not_found.title=Site nicht verf\u00fcgbar
+sites.not_found_message=Keine Site mit Identifier {0} gefunden.
+site.details.title=Site {0}
+sites.details.domain=Domain
+sites.details.defaultSite=Standard Seite?
+sites.details.defaultSite.yes=Ja
+sites.details.defaultSite.no=Nein
+sites.details.defaultTheme=Standard Theme
+site.details.edit=Bearbeiten
+sites.site.edit.label=Bearbeiten
+sites.breadcrumbs.create=Neue Site anlegen
+sites.breadcrumbs.edit=Bearbeiten
+sites.create.label=Neue Site anlegen
+sites.edit.label=Site {0} bearbeiten
+sites.form.domain.help=Die Domain der Seite
+sites.form.domain.label=Domain
+sites.form.defaultsite.label=Ist Standard-Seite?
+sites.form.defaulttheme.help=Das Standard-Theme der Seite
+sites.form.defaulttheme.label=Standard Theme
+sites.form.buttons.cancel=Abbrechen
+sites.form.buttons.create=Site anlegen
+sites.form.buttons.save=Speichern

From 99f65ecc068a2e8b182094eddc8dc1dc7e831cc9 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 25 Nov 2020 21:32:19 +0100
Subject: [PATCH 74/93] Overview page for Application Admin

---
 .../applications/ApplicationController.java   | 27 +++++
 .../applications/ApplicationTypeInfoItem.java | 98 +++++++++++++++++++
 .../applications/ApplicationsController.java  | 68 ++++++++++++-
 .../admin/applications/ApplicationsPage.java  |  2 +-
 .../DefaultApplicationController.java         | 27 +++++
 .../org/libreccm/web/ApplicationType.java     |  7 ++
 .../org/libreccm/ui/admin/applications.xhtml  | 25 -----
 .../admin/applications/applicationtypes.xhtml | 50 ++++++++++
 .../ui/admin/categories/categorysystems.xhtml | 25 +----
 .../org/libreccm/ui/AdminBundle.properties    |  2 +
 .../org/libreccm/ui/AdminBundle_de.properties |  2 +
 11 files changed, 285 insertions(+), 48 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java
 delete mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java
new file mode 100644
index 000000000..f18aa74d6
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.applications;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public interface ApplicationController {
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
new file mode 100644
index 000000000..6c58dca64
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.applications;
+
+import java.util.Objects;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class ApplicationTypeInfoItem implements
+    Comparable<ApplicationTypeInfoItem> {
+
+    private String name;
+
+    private String title;
+
+    private String description;
+
+    private boolean singleton;
+
+    private long numberOfInstances;
+
+    protected ApplicationTypeInfoItem() {
+        // Nothing
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    protected void setName(final String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    protected void setTitle(final String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    protected void setDescription(final String description) {
+        this.description = description;
+    }
+
+    public boolean isSingleton() {
+        return singleton;
+    }
+
+    protected void setSingleton(final boolean singleton) {
+        this.singleton = singleton;
+    }
+
+    public long getNumberOfInstances() {
+        return numberOfInstances;
+    }
+
+    protected void setNumberOfInstances(final long numberOfInstances) {
+        this.numberOfInstances = numberOfInstances;
+    }
+
+    @Override
+    public int compareTo(final ApplicationTypeInfoItem other) {
+        if (other == null) {
+            return 1;
+        }
+
+        int result = Objects.compare(title, other.getTitle(), String::compareTo);
+        if (result == 0) {
+            result = Objects.compare(name, other.getName(), String::compareTo);
+        }
+
+        return result;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
index 0a9eff521..720442830 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
@@ -19,13 +19,25 @@
 package org.libreccm.ui.admin.applications;
 
 import org.libreccm.core.CoreConstants;
+import org.libreccm.l10n.GlobalizationHelper;
+import org.libreccm.l10n.LocalizedTextsUtil;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.web.ApplicationManager;
+import org.libreccm.web.ApplicationRepository;
+import org.libreccm.web.ApplicationType;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.mvc.Models;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 
 /**
  *
@@ -35,12 +47,64 @@ import javax.ws.rs.Path;
 @Controller
 @Path("/applications")
 public class ApplicationsController {
+
+    @Inject
+    private ApplicationManager appManager;
     
+    @Inject
+    private ApplicationRepository appRepository;
+
+    @Inject
+    private GlobalizationHelper globalizationHelper;
+    
+    @Inject
+    private Models models;
+
     @GET
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getApplications() {
-        return "org/libreccm/ui/admin/applications.xhtml";
+    public String getApplicationTypes() {
+        final List<ApplicationTypeInfoItem> appTypes = appManager
+            .getApplicationTypes()
+            .entrySet()
+            .stream()
+            .map(Map.Entry::getValue)
+            .map(this::buildTypeInfoItem)
+            .sorted()
+            .collect(Collectors.toList());
+        
+        models.put("applicationTypes", appTypes);
+
+        return "org/libreccm/ui/admin/applications/applicationtypes.xhtml";
     }
+
+    @GET
+    @Path("/{type}")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String getApplicationInstances(
+        @PathParam("type") final String type
+    ) {
+        throw new UnsupportedOperationException();
+    }
+    
+    private ApplicationTypeInfoItem buildTypeInfoItem(
+        final ApplicationType applicationType
+    ) {
+        final ApplicationTypeInfoItem item = new ApplicationTypeInfoItem();
+        item.setName(applicationType.name());
+
+        final LocalizedTextsUtil textsUtil = globalizationHelper
+            .getLocalizedTextsUtil(applicationType.descBundle());
+        item.setTitle(textsUtil.getText(applicationType.titleKey()));
+        item.setDescription(textsUtil.getText(applicationType.descKey()));
+        item.setSingleton(applicationType.singleton());
+        item.setNumberOfInstances(
+            appRepository.findByType(applicationType.name()).size()
+        );
+
+        return item;
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
index 185670232..48a7677c3 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
@@ -43,7 +43,7 @@ public class ApplicationsPage implements AdminPage {
     @Override
     public String getUriIdentifier() {
         return String.format(
-            "%s#getApplications", ApplicationsController.class.getSimpleName()
+            "%s#getApplicationTypes", ApplicationsController.class.getSimpleName()
         );
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java
new file mode 100644
index 000000000..7f76e96a7
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.applications;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class DefaultApplicationController implements ApplicationController {
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java
index 5c5019960..285b56225 100644
--- a/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java
+++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java
@@ -23,8 +23,12 @@ import com.arsdigita.ui.admin.applications.AbstractAppSettingsPane;
 import com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm;
 import com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane;
 
+import org.libreccm.ui.admin.applications.ApplicationController;
+import org.libreccm.ui.admin.applications.DefaultApplicationController;
+
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -111,9 +115,12 @@ public @interface ApplicationType {
      *
      * @return
      */
+    @SuppressWarnings("rawtypes") // Can't specify type here, otherwise problems in using classes.
     Class<? extends ApplicationCreator> creator();
 
     Class<? extends AbstractAppInstanceForm> instanceForm() default DefaultApplicationInstanceForm.class;
+    
+    Class<? extends ApplicationController> adminController() default DefaultApplicationController.class;
 
     Class<? extends AbstractAppSettingsPane> settingsPane() default DefaultApplicationSettingsPane.class;
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml
deleted file mode 100644
index 25c5db283..000000000
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications.xhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" 
-      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/libreccm/ui/admin/ccm-admin.xhtml">
-
-        <ui:param name="activePage" value="applications" />
-        <ui:param name="title" value="#{AdminMessages['applications.label']}" />
-
-        <ui:define name="breadcrumb">
-            <li class="breadcrumb-item active">
-                #{AdminMessages['applications.label']}
-            </li>
-        </ui:define>
-
-        <ui:define name="main">
-            <div class="container">
-                <h1>#{AdminMessages['applications.label']}</h1>
-                <p>Placeholder</p>
-            </div>
-        </ui:define>
-
-    </ui:composition>
-</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml
new file mode 100644
index 000000000..15c80fe63
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="applications" />
+        <ui:param name="title" value="#{AdminMessages['applications.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['applications.label']}
+            </li>
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['applications.label']}</h1>
+                
+                <ul class="list-group">
+                    <c:forEach items="#{applicationTypes}" var="type">
+                        <li class="list-group-item">
+                            <div class="d-flex w-100 justify-content-between align-items-center">
+                                <h2>
+                                    <a href="#{mvc.uri('ApplicationsController#getApplicationInstances', {'type': type.name})}">${type.title}</a>
+                                </h2>
+                                <small class="badge badge-info badge-pill">
+                                    <c:choose>
+                                        <c:when test="#{type.singleton}">
+                                            #{AdminMessages['applications.types.singleton']}
+                                        </c:when>
+                                        <c:otherwise>
+                                            #{AdminMessages.getMessage('applications.number_of_instances', [type.numberOfInstances])}
+                                        </c:otherwise>
+                                    </c:choose>
+                                </small>
+                            </div>
+                            <p>
+                                ${type.description}
+                            </p>
+                        </li>
+                    </c:forEach>
+                </ul>
+                
+            </div>
+        </ui:define>
+
+    </ui:composition>
+</html>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
index 8b3514435..779cbfa94 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystems.xhtml
@@ -1,9 +1,9 @@
 <!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <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">
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
         <ui:param name="activePage" value="categories" />
@@ -28,12 +28,7 @@
                 <div class="text-right mb-2">
                     <a class="btn btn-secondary"
                        href="#{mvc.uri('CategorySystemsController#newCategorySystem')}">
-                        <svg class="bi"
-                             width="1em"
-                             height="1em"
-                             fill="currentColor">
-                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#plus-circle" />
-                        </svg>
+                        <bootstrap:svgIcon icon="plus-circle" />
                         <span>#{AdminMessages['categorysystems.add']}</span>
                     </a>
                 </div>
@@ -60,12 +55,7 @@
                                 <td>
                                     <a class="btn btn-info"
                                        href="#{mvc.uri('CategorySystemsController#getCategorySystemDetails', { 'categorySystemIdentifier': categorySystem.identifier })}">
-                                        <svg class="bi"
-                                             width="1em"
-                                             height="1em"
-                                             fill="currentColor">
-                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#pen" />
-                                        </svg>
+                                        <bootstrap:svgIcon icon="pen"/>
                                         #{AdminMessages['categorysystems.table.actions.edit']}
                                     </a>
                                 </td>
@@ -74,12 +64,7 @@
                                             data-target="#confirm-delete-#{categorySystem.identifier}"
                                             data-toggle="modal"
                                             type="button">
-                                        <svg class="bi"
-                                             width="1em"
-                                             height="1em"
-                                             fill="currentColor">
-                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#x-circle" />
-                                        </svg>
+                                        <bootstrap:svgIcon icon="x-circle" />
                                         #{AdminMessages['categorysystems.table.actions.delete']}
                                     </button>
                                     <div class="modal"
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index e022c886e..90332823f 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -490,3 +490,5 @@ sites.form.defaulttheme.label=Default Theme
 sites.form.buttons.cancel=Cancel
 sites.form.buttons.create=Create Site
 sites.form.buttons.save=Save
+applications.types.singleton=Singleton
+applications.number_of_instances={0} instances
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index c4a803425..b4410ea95 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -490,3 +490,5 @@ sites.form.defaulttheme.label=Standard Theme
 sites.form.buttons.cancel=Abbrechen
 sites.form.buttons.create=Site anlegen
 sites.form.buttons.save=Speichern
+applications.types.singleton=Singleton
+applications.number_of_instances={0} Instanzen

From c7ff731461f109216e1cd22119fe75a5ff43cc03 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 26 Nov 2020 21:42:35 +0100
Subject: [PATCH 75/93] Admin UI for Applications

---
 .../applications/ApplicationController.java   |   2 +
 .../applications/ApplicationTypeInfoItem.java |  10 ++
 .../applications/ApplicationsController.java  |  67 +++++++--
 .../admin/applications/ApplicationsPage.java  |  16 +-
 ...r.java => IsApplicationControllerFor.java} |  23 ++-
 .../org/libreccm/web/ApplicationType.java     |   7 +-
 .../admin/applications/applicationtypes.xhtml |  10 +-
 .../org/libreccm/ui/AdminBundle.properties    |   1 +
 .../org/libreccm/ui/AdminBundle_de.properties |   1 +
 ccm-shortcuts/pom.xml                         |  15 ++
 .../shortcuts/ShortcutAdminMessages.java      | 141 ++++++++++++++++++
 .../ShortcutsApplicationController.java       |  58 +++++++
 .../applications/shortcuts/shortcuts.xhtml    |  67 +++++++++
 .../shortcuts/ShortcutsResources.properties   |   1 +
 .../ShortcutsResources_de.properties          |   1 +
 15 files changed, 397 insertions(+), 23 deletions(-)
 rename ccm-core/src/main/java/org/libreccm/ui/admin/applications/{DefaultApplicationController.java => IsApplicationControllerFor.java} (65%)
 create mode 100644 ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutAdminMessages.java
 create mode 100644 ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java
 create mode 100644 ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java
index f18aa74d6..798f71912 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java
@@ -24,4 +24,6 @@ package org.libreccm.ui.admin.applications;
  */
 public interface ApplicationController {
     
+    String getApplication();
+    
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
index 6c58dca64..b598f9e66 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
@@ -36,6 +36,8 @@ public class ApplicationTypeInfoItem implements
     private boolean singleton;
 
     private long numberOfInstances;
+    
+    private String controllerLink;
 
     protected ApplicationTypeInfoItem() {
         // Nothing
@@ -80,6 +82,14 @@ public class ApplicationTypeInfoItem implements
     protected void setNumberOfInstances(final long numberOfInstances) {
         this.numberOfInstances = numberOfInstances;
     }
+    
+    public String getControllerLink() {
+        return controllerLink;
+    }
+    
+    protected void setControllerLink(final String controllerLink) {
+        this.controllerLink = controllerLink;
+    }
 
     @Override
     public int compareTo(final ApplicationTypeInfoItem other) {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
index 720442830..531abaf94 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
@@ -32,12 +32,15 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
+import javax.mvc.MvcContext;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
 
 /**
  *
@@ -50,16 +53,23 @@ public class ApplicationsController {
 
     @Inject
     private ApplicationManager appManager;
-    
+
     @Inject
     private ApplicationRepository appRepository;
 
     @Inject
     private GlobalizationHelper globalizationHelper;
-    
+
     @Inject
     private Models models;
 
+    @Inject
+    private MvcContext mvc;
+
+    @Inject
+    @Any
+    private Instance<ApplicationController> applicationControllers;
+
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -73,22 +83,12 @@ public class ApplicationsController {
             .map(this::buildTypeInfoItem)
             .sorted()
             .collect(Collectors.toList());
-        
+
         models.put("applicationTypes", appTypes);
 
         return "org/libreccm/ui/admin/applications/applicationtypes.xhtml";
     }
 
-    @GET
-    @Path("/{type}")
-    @AuthorizationRequired
-    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-    public String getApplicationInstances(
-        @PathParam("type") final String type
-    ) {
-        throw new UnsupportedOperationException();
-    }
-    
     private ApplicationTypeInfoItem buildTypeInfoItem(
         final ApplicationType applicationType
     ) {
@@ -104,7 +104,46 @@ public class ApplicationsController {
             appRepository.findByType(applicationType.name()).size()
         );
 
+        final IsApplicationControllerForLiteral literal
+            = new IsApplicationControllerForLiteral(applicationType.name());
+
+        final Instance<ApplicationController> instance = applicationControllers
+            .select(literal);
+
+        if (instance.isResolvable()) {
+            final ApplicationController controller = instance.get();
+            item.setControllerLink(
+                mvc.uri(
+                    String.format(
+                        "%s#getApplication",
+                        controller.getClass().getSimpleName()
+                    )
+                ).toString()
+            );
+        }
+
         return item;
     }
 
+    private class IsApplicationControllerForLiteral
+        extends AnnotationLiteral<IsApplicationControllerFor>
+        implements IsApplicationControllerFor {
+
+        private static final long serialVersionUID = 1L;
+
+        private final String value;
+
+        public IsApplicationControllerForLiteral(
+            final String value
+        ) {
+            this.value = value;
+        }
+
+        @Override
+        public String value() {
+            return value;
+        }
+
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
index 48a7677c3..04ea09731 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
@@ -25,6 +25,9 @@ import java.util.HashSet;
 import java.util.Set;
 
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
 
 /**
  *
@@ -33,17 +36,28 @@ import javax.enterprise.context.ApplicationScoped;
 @ApplicationScoped
 public class ApplicationsPage implements AdminPage {
 
+    @Inject
+    @Any
+    private Instance<ApplicationController> applicationControllers;
+    
     @Override
     public Set<Class<?>> getControllerClasses() {
         final Set<Class<?>> classes = new HashSet<>();
         classes.add(ApplicationsController.class);
+        
+        applicationControllers
+            .stream()
+            .map(controller -> controller.getClass())
+            .forEach(classes::add);
+        
         return classes;
     }
 
     @Override
     public String getUriIdentifier() {
         return String.format(
-            "%s#getApplicationTypes", ApplicationsController.class.getSimpleName()
+            "%s#getApplicationTypes", ApplicationsController.class
+                .getSimpleName()
         );
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/IsApplicationControllerFor.java
similarity index 65%
rename from ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java
rename to ccm-core/src/main/java/org/libreccm/ui/admin/applications/IsApplicationControllerFor.java
index 7f76e96a7..a6921d67d 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/IsApplicationControllerFor.java
@@ -18,10 +18,31 @@
  */
 package org.libreccm.ui.admin.applications;
 
+import org.libreccm.web.CcmApplication;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class DefaultApplicationController implements ApplicationController {
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target(
+    {
+        ElementType.METHOD,
+        ElementType.FIELD,
+        ElementType.PARAMETER,
+        ElementType.TYPE
+    }
+)
+public @interface IsApplicationControllerFor {
+
+    String value();
     
 }
diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java
index 285b56225..9d663c2ee 100644
--- a/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java
+++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java
@@ -23,9 +23,6 @@ import com.arsdigita.ui.admin.applications.AbstractAppSettingsPane;
 import com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm;
 import com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane;
 
-import org.libreccm.ui.admin.applications.ApplicationController;
-import org.libreccm.ui.admin.applications.DefaultApplicationController;
-
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 
@@ -119,9 +116,7 @@ public @interface ApplicationType {
     Class<? extends ApplicationCreator> creator();
 
     Class<? extends AbstractAppInstanceForm> instanceForm() default DefaultApplicationInstanceForm.class;
-    
-    Class<? extends ApplicationController> adminController() default DefaultApplicationController.class;
-
+  
     Class<? extends AbstractAppSettingsPane> settingsPane() default DefaultApplicationSettingsPane.class;
 
 }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml
index 15c80fe63..a66f89d76 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml
@@ -23,13 +23,21 @@
                         <li class="list-group-item">
                             <div class="d-flex w-100 justify-content-between align-items-center">
                                 <h2>
-                                    <a href="#{mvc.uri('ApplicationsController#getApplicationInstances', {'type': type.name})}">${type.title}</a>
+                                    <c:when test="#{type.controllerLink != null}">
+                                        <a href="#{type.controllerLink}">#{type.title}</a>
+                                    </c:when>
+                                    <c:otherwise>
+                                        #{type.title}
+                                    </c:otherwise>
                                 </h2>
                                 <small class="badge badge-info badge-pill">
                                     <c:choose>
                                         <c:when test="#{type.singleton}">
                                             #{AdminMessages['applications.types.singleton']}
                                         </c:when>
+                                        <c:when test="#{type.numberOfInstances == 1}">
+                                                #{AdminMessages.getMessage('applications.number_of_instances_one', [type.numberOfInstances])}
+                                        </c:when>
                                         <c:otherwise>
                                             #{AdminMessages.getMessage('applications.number_of_instances', [type.numberOfInstances])}
                                         </c:otherwise>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 90332823f..7bf9becf9 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -492,3 +492,4 @@ sites.form.buttons.create=Create Site
 sites.form.buttons.save=Save
 applications.types.singleton=Singleton
 applications.number_of_instances={0} instances
+applications.number_of_instances_one={0} instance
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index b4410ea95..3829640f5 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -492,3 +492,4 @@ sites.form.buttons.create=Site anlegen
 sites.form.buttons.save=Speichern
 applications.types.singleton=Singleton
 applications.number_of_instances={0} Instanzen
+applications.number_of_instances_one={0} instance
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index ef64710d5..92b3992c7 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -73,6 +73,21 @@
             <scope>provided</scope>
         </dependency>
         
+         <dependency>
+            <groupId>javax.mvc</groupId>
+            <artifactId>javax.mvc-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.krazo</groupId>
+            <artifactId>krazo-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.krazo.ext</groupId>
+            <artifactId>krazo-freemarker</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutAdminMessages.java b/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutAdminMessages.java
new file mode 100644
index 000000000..0d65d7cd1
--- /dev/null
+++ b/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutAdminMessages.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.applications.shortcuts;
+
+import org.libreccm.l10n.GlobalizationHelper;
+import org.libreccm.shortcuts.ShortcutsConstants;
+import org.libreccm.ui.admin.AdminConstants;
+
+import java.text.MessageFormat;
+import java.util.AbstractMap;
+import java.util.List;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("ShortcutAdminMessages")
+public class ShortcutAdminMessages extends AbstractMap<String, String> {
+
+    /**
+     * Provides access to the locale negoiated by LibreCCM.
+     */
+    @Inject
+    private GlobalizationHelper globalizationHelper;
+
+    /**
+     * The {@link ResourceBundle} to use.
+     */
+    private ResourceBundle messages;
+
+    /**
+     * Loads the resource bundle.
+     */
+    @PostConstruct
+    private void init() {
+        messages = ResourceBundle.getBundle(
+            ShortcutsConstants.SHORTCUTS_BUNDLE,
+            globalizationHelper.getNegotiatedLocale()
+        );
+    }
+
+    /**
+     * Retrieves a message from the resource bundle.
+     *
+     * @param key The key of the message.
+     *
+     * @return The translated message or {@code ???message???} if the the key is
+     *         not found in the resource bundle (message is replaced with the
+     *         key).
+     */
+    public String getMessage(final String key) {
+        if (messages.containsKey(key)) {
+            return messages.getString(key);
+        } else {
+            return String.format("???%s???", key);
+        }
+    }
+
+    /**
+     * Retrieves a message with placeholders.
+     *
+     * @param key        The key of the message.
+     * @param parameters The parameters for the placeholders.
+     *
+     * @return The translated message or {@code ???message???} if the the key is
+     *         not found in the resource bundle (message is replaced with the
+     *         key).
+     */
+    public String getMessage(
+        final String key, final List<Object> parameters
+    ) {
+        return getMessage(key, parameters.toArray());
+    }
+
+    /**
+     * The translated message or {@code ???message???} if the the key is not
+     * found in the resource bundle (message is replaced with the key).
+     *
+     * @param key        The key of the message.
+     * @param parameters The parameters for the placeholders.
+     *
+     * @return The translated message or {@code ???message???} if the the key is
+     *         not found in the resource bundle (message is replaced with the
+     *         key).
+     */
+    public String getMessage(
+        final String key, final Object[] parameters
+    ) {
+        if (messages.containsKey(key)) {
+            return MessageFormat.format(messages.getString(key), parameters);
+        } else {
+            return String.format("???%s???", key);
+        }
+    }
+
+    @Override
+    public String get(final Object key) {
+        return get((String) key);
+    }
+
+    public String get(final String key) {
+        return getMessage(key);
+    }
+
+    @Override
+    public Set<Entry<String, String>> entrySet() {
+        return messages
+            .keySet()
+            .stream()
+            .collect(
+                Collectors.toMap(key -> key, key -> messages.getString(key))
+            )
+            .entrySet();
+    }
+
+}
diff --git a/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java b/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java
new file mode 100644
index 000000000..101a60b0c
--- /dev/null
+++ b/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.applications.shortcuts;
+
+import org.libreccm.shortcuts.ShortcutRepository;
+import org.libreccm.shortcuts.ShortcutsConstants;
+import org.libreccm.ui.admin.applications.ApplicationController;
+import org.libreccm.ui.admin.applications.IsApplicationControllerFor;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+//@IsApplicationControllerFor(ShortcutsConstants.SHORTCUTS_APP_TYPE)
+@Path("/application")
+public class ShortcutsApplicationController implements ApplicationController {
+
+    @Inject
+    private Models models;
+
+    @Inject
+    private ShortcutRepository shortcutRepository;
+
+    @GET
+    @Path("/")
+    @Override
+    public String getApplication() {
+        models.put("shortcuts", shortcutRepository.findAll());
+        
+        return "org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml";
+    }
+
+}
diff --git a/ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml b/ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml
new file mode 100644
index 000000000..4b6e0f517
--- /dev/null
+++ b/ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml
@@ -0,0 +1,67 @@
+<!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/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="applications" />
+        <ui:param name="title" value="#{AdminMessages['applications.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                #{AdminMessages['applications.label']}
+            </li>
+            <li class="breadcrumb-item active">
+                #{ShortcutAdminMessages['application_title']}
+            </li>
+        </ui:define>
+        
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{ShortcutAdminMessages['application_title']}</h1>
+                
+                <div class="text-right mb-2">
+                    <a class="btn btn-secondary"
+                       href="#">
+                        <bootstrap:svgIcon icon="plus-circle" />
+                        <span>#{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut']}</span>
+                    </a>
+                </div>
+                <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th>#{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.col_url_key.header']}</th>
+                            <th>#{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.col_redirect.header']}</th>
+                            <th class="text-center" colspan="2"><th>#{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.col_actions.header']}</th></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <c:forEach items="#{shortcuts}" var="shortcut">
+                            <tr>
+                                <td>#{shortcut.urlKey}</td>
+                                <td>#{shortcut.redirect}</td>
+                                <td>
+                                    <a class="btn btn-info" 
+                                       href="#">
+                                           <bootstrap:svgIcon icon="pen"/>
+                                           #{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.edit']}
+                                    </a>
+                                </td>
+                                <td>
+                                    <a class="btn btn-danger" 
+                                       href="#">
+                                           <bootstrap:svgIcon icon="x-circle"/>
+                                           #{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.delete']}
+                                    </a>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </ui:define>
+    </ui:composition>
+</html>
+
diff --git a/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources.properties b/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources.properties
index 38469b544..23af7122d 100644
--- a/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources.properties
+++ b/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources.properties
@@ -19,6 +19,7 @@ application_title=Shortcuts
 application_desc=Manage short URLs for internal and external redirects.
 shortcuts.ui.admin.shortcuts_table.col_url_key.header=URL
 shortcuts.ui.admin.shortcuts_table.col_redirect.header=Redirect
+shortcuts.ui.admin.shortcuts_table.col_actions.header=Actions
 shortcuts.ui.admin.shortcuts_table.col_edit.header=Edit
 shortcuts.ui.admin.shortcuts_table.col_delete.header=Delete
 shortcuts.ui.admin.shortcuts_table.edit=Edit
diff --git a/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources_de.properties b/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources_de.properties
index 1fefabf78..5d3b1aaae 100644
--- a/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources_de.properties
+++ b/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources_de.properties
@@ -32,3 +32,4 @@ shortcuts.ui.admin.redirect.error.invalid=Das Ziel der Weiterleitung muss eine a
 shortcuts.ui.admin.heading=Shortcuts verwalten
 shortcuts.ui.admin.table.empty=Es wurden noch keine Shortcuts angelegt.
 shortcuts.ui.admin.add_shortcut=Shortcut hinzuf\u00fcgen
+shortcuts.ui.admin.shortcuts_table.col_actions.header=Aktionen

From 9983db5c42acc9120e6192bab2f7acc99aaf4359 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 28 Nov 2020 17:53:01 +0100
Subject: [PATCH 76/93] Applications administration, Shortcuts administration

---
 ccm-bundle-devel-wildfly/pom.xml              |  8 ++
 .../src/main/resources/log4j2.xml             |  6 ++
 .../libreccm/ui/admin/AdminApplication.java   | 20 ++--
 .../applications/ApplicationTypeInfoItem.java |  2 +-
 .../applications/ApplicationsController.java  | 61 ++++--------
 .../admin/applications/ApplicationsPage.java  | 29 ++++--
 ...java => DefaultApplicationController.java} | 33 +++----
 .../org/libreccm/web/ApplicationType.java     |  5 +
 .../components/bootstrap/formGroupText.xhtml  |  1 +
 .../admin/applications/applicationtypes.xhtml | 21 +++--
 .../categories/categorysystem-details.xhtml   |  4 +-
 .../org/libreccm/shortcuts/Shortcuts.java     | 27 +++---
 .../ShortcutsApplicationController.java       | 80 +++++++++++++++-
 .../applications/shortcuts/shortcuts.xhtml    | 92 +++++++++++++++----
 .../shortcuts/ShortcutsResources.properties   | 17 ++++
 .../ShortcutsResources_de.properties          | 17 ++++
 16 files changed, 294 insertions(+), 129 deletions(-)
 rename ccm-core/src/main/java/org/libreccm/ui/admin/applications/{IsApplicationControllerFor.java => DefaultApplicationController.java} (66%)

diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml
index e936bc880..1cdb1c0f4 100644
--- a/ccm-bundle-devel-wildfly/pom.xml
+++ b/ccm-bundle-devel-wildfly/pom.xml
@@ -216,6 +216,14 @@
                                 <include>WEB-INF/</include>
                             </includes>
                         </overlay>
+                        <overlay>
+                            <groupId>org.libreccm</groupId>
+                            <artifactId>ccm-shortcuts</artifactId>
+                            <type>jar</type>
+                            <includes>
+                                <include>WEB-INF/</include>
+                            </includes>
+                        </overlay>
                         <overlay>
                             <groupId>org.libreccm</groupId>
                             <artifactId>ccm-core</artifactId>
diff --git a/ccm-bundle-devel-wildfly/src/main/resources/log4j2.xml b/ccm-bundle-devel-wildfly/src/main/resources/log4j2.xml
index ad3d929fb..e5dac78bf 100644
--- a/ccm-bundle-devel-wildfly/src/main/resources/log4j2.xml
+++ b/ccm-bundle-devel-wildfly/src/main/resources/log4j2.xml
@@ -101,5 +101,11 @@
         <Logger name="com.arsdigita.web.DefaultApplicationFileResolver"
                 level="debug">
         </Logger>
+        <Logger name = "org.libreccm.ui.admin.AdminApplication"
+                level="debug">
+        </Logger>
+        <Logger name="org.libreccm.ui.admin.applications.ApplicationsPage"
+                level="debug">
+        </Logger>
     </Loggers>
 </Configuration>
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
index 193aee0e1..3afdaeb16 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminApplication.java
@@ -18,9 +18,12 @@
  */
 package org.libreccm.ui.admin;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.libreccm.ui.IsAuthenticatedFilter;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -32,12 +35,16 @@ import javax.ws.rs.core.Application;
 /**
  * Collects the controllers for the admin application and registers them with
  * JAX-RS.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @ApplicationPath("/@admin")
 public class AdminApplication extends Application {
 
+    private static final Logger LOGGER = LogManager.getLogger(
+        AdminApplication.class
+    );
+
     /**
      * Injection point for the admin pages.
      */
@@ -49,7 +56,7 @@ public class AdminApplication extends Application {
         final Set<Class<?>> classes = new HashSet<>();
 
         classes.add(IsAuthenticatedFilter.class);
-        
+
         classes.addAll(
             adminPages
                 .stream()
@@ -58,12 +65,11 @@ public class AdminApplication extends Application {
                 .collect(Collectors.toSet())
         );
 
-        return classes;
+        LOGGER.debug(
+            "Adding classes to AdminApplication: {}", Objects.toString(classes)
+        );
 
-//        final Set<Class<?>> classes = new HashSet<>();
-//        classes.add(SystemInformationController.class);
-////        classes.add(UsersApi.class);
-//        return classes;
+        return classes;
     }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
index b598f9e66..862171648 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
@@ -36,7 +36,7 @@ public class ApplicationTypeInfoItem implements
     private boolean singleton;
 
     private long numberOfInstances;
-    
+       
     private String controllerLink;
 
     protected ApplicationTypeInfoItem() {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
index 531abaf94..b94ec271c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
@@ -32,13 +32,11 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
 import javax.mvc.MvcContext;
+import javax.transaction.Transactional;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
@@ -63,17 +61,14 @@ public class ApplicationsController {
     @Inject
     private Models models;
 
-    @Inject
-    private MvcContext mvc;
-
-    @Inject
-    @Any
-    private Instance<ApplicationController> applicationControllers;
+//    @Inject
+//    private MvcContext mvc;
 
     @GET
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     public String getApplicationTypes() {
         final List<ApplicationTypeInfoItem> appTypes = appManager
             .getApplicationTypes()
@@ -104,46 +99,26 @@ public class ApplicationsController {
             appRepository.findByType(applicationType.name()).size()
         );
 
-        final IsApplicationControllerForLiteral literal
-            = new IsApplicationControllerForLiteral(applicationType.name());
+        final Class<? extends ApplicationController> controllerClass
+            = applicationType.applicationController();
 
-        final Instance<ApplicationController> instance = applicationControllers
-            .select(literal);
-
-        if (instance.isResolvable()) {
-            final ApplicationController controller = instance.get();
+        if (!DefaultApplicationController.class
+            .isAssignableFrom(controllerClass)) {
+//            item.setControllerLink(
+//                mvc.uri(
+//                    String.format(
+//                        "%s#getApplication", controllerClass.getSimpleName()
+//                    )
+//                ).toString()
+//            );
             item.setControllerLink(
-                mvc.uri(
-                    String.format(
-                        "%s#getApplication",
-                        controller.getClass().getSimpleName()
-                    )
-                ).toString()
+                String.format(
+                    "%s#getApplication",
+                    controllerClass.getSimpleName())
             );
         }
 
         return item;
     }
 
-    private class IsApplicationControllerForLiteral
-        extends AnnotationLiteral<IsApplicationControllerFor>
-        implements IsApplicationControllerFor {
-
-        private static final long serialVersionUID = 1L;
-
-        private final String value;
-
-        public IsApplicationControllerForLiteral(
-            final String value
-        ) {
-            this.value = value;
-        }
-
-        @Override
-        public String value() {
-            return value;
-        }
-
-    }
-
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
index 04ea09731..d55460afb 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
@@ -18,15 +18,17 @@
  */
 package org.libreccm.ui.admin.applications;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.libreccm.ui.admin.AdminConstants;
 import org.libreccm.ui.admin.AdminPage;
+import org.libreccm.web.ApplicationManager;
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 
 /**
@@ -35,21 +37,28 @@ import javax.inject.Inject;
  */
 @ApplicationScoped
 public class ApplicationsPage implements AdminPage {
+    
+    private static final Logger LOGGER = LogManager.getLogger(
+        ApplicationsPage.class
+    );
 
     @Inject
-    @Any
-    private Instance<ApplicationController> applicationControllers;
-    
+    private ApplicationManager applicationManager;
+
     @Override
     public Set<Class<?>> getControllerClasses() {
         final Set<Class<?>> classes = new HashSet<>();
         classes.add(ApplicationsController.class);
         
-        applicationControllers
-            .stream()
-            .map(controller -> controller.getClass())
-            .forEach(classes::add);
-        
+        classes.addAll(
+            applicationManager
+                .getApplicationTypes()
+                .entrySet()
+                .stream()
+                .map(type -> type.getValue().applicationController())
+                .collect(Collectors.toSet())
+        );
+
         return classes;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/IsApplicationControllerFor.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java
similarity index 66%
rename from ccm-core/src/main/java/org/libreccm/ui/admin/applications/IsApplicationControllerFor.java
rename to ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java
index a6921d67d..126ed7f15 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/IsApplicationControllerFor.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java
@@ -18,31 +18,22 @@
  */
 package org.libreccm.ui.admin.applications;
 
-import org.libreccm.web.CcmApplication;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
+import javax.enterprise.context.RequestScoped;
+import javax.mvc.Controller;
+import javax.ws.rs.Path;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-@Qualifier
-@Retention(RetentionPolicy.RUNTIME)
-@Target(
-    {
-        ElementType.METHOD,
-        ElementType.FIELD,
-        ElementType.PARAMETER,
-        ElementType.TYPE
-    }
-)
-public @interface IsApplicationControllerFor {
+@RequestScoped
+@Controller
+@Path("/application")
+public class DefaultApplicationController implements ApplicationController {
+
+    @Override
+    public String getApplication() {
+        return "";
+    }
 
-    String value();
-    
 }
diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java
index 9d663c2ee..a66cd3a61 100644
--- a/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java
+++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationType.java
@@ -23,6 +23,9 @@ import com.arsdigita.ui.admin.applications.AbstractAppSettingsPane;
 import com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm;
 import com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane;
 
+import org.libreccm.ui.admin.applications.ApplicationController;
+import org.libreccm.ui.admin.applications.DefaultApplicationController;
+
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 
@@ -118,5 +121,7 @@ public @interface ApplicationType {
     Class<? extends AbstractAppInstanceForm> instanceForm() default DefaultApplicationInstanceForm.class;
   
     Class<? extends AbstractAppSettingsPane> settingsPane() default DefaultApplicationSettingsPane.class;
+    
+    Class<? extends ApplicationController> applicationController() default DefaultApplicationController.class;
 
 }
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
index ad68cfeca..1d9664069 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml
@@ -53,6 +53,7 @@
         <div class="form-group">
             <label for="#{cc.attrs.inputId}">${cc.attrs.label}</label>
             <input aria-describedby="#{cc.attrs.inputId}-help"
+                   class="form-control"
                    id="#{cc.attrs.inputId}"
                    maxlength="#{(not empty cc.attrs.maxlength) ? cc.attrs.maxlength : null}"
                    minlength="#{(not empty cc.attrs.minlength) ? cc.attrs.minlength : null}"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml
index a66f89d76..45721134f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/applicationtypes.xhtml
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       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/libreccm/ui/admin/ccm-admin.xhtml">
 
@@ -17,18 +16,20 @@
         <ui:define name="main">
             <div class="container">
                 <h1>#{AdminMessages['applications.label']}</h1>
-                
+
                 <ul class="list-group">
                     <c:forEach items="#{applicationTypes}" var="type">
                         <li class="list-group-item">
                             <div class="d-flex w-100 justify-content-between align-items-center">
                                 <h2>
-                                    <c:when test="#{type.controllerLink != null}">
-                                        <a href="#{type.controllerLink}">#{type.title}</a>
-                                    </c:when>
-                                    <c:otherwise>
-                                        #{type.title}
-                                    </c:otherwise>
+                                    <c:choose>
+                                        <c:when test="#{type.controllerLink != null}">
+                                            <a href="#{mvc.uri(type.controllerLink)}">#{type.title}</a>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <span>#{type.title}</span>
+                                        </c:otherwise>
+                                    </c:choose>
                                 </h2>
                                 <small class="badge badge-info badge-pill">
                                     <c:choose>
@@ -36,7 +37,7 @@
                                             #{AdminMessages['applications.types.singleton']}
                                         </c:when>
                                         <c:when test="#{type.numberOfInstances == 1}">
-                                                #{AdminMessages.getMessage('applications.number_of_instances_one', [type.numberOfInstances])}
+                                            #{AdminMessages.getMessage('applications.number_of_instances_one', [type.numberOfInstances])}
                                         </c:when>
                                         <c:otherwise>
                                             #{AdminMessages.getMessage('applications.number_of_instances', [type.numberOfInstances])}
@@ -50,7 +51,7 @@
                         </li>
                     </c:forEach>
                 </ul>
-                
+
             </div>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
index 5d32e6eb2..afcdba4fb 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/categorysystem-details.xhtml
@@ -2,10 +2,10 @@
 <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:f="http://xmlns.jcp.org/jsf/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:f="http://xmlns.jcp.org/jsf/core">
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
         <ui:param name="activePage" value="categories" />
diff --git a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java
index f9a838e64..2415c8f3d 100644
--- a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java
+++ b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java
@@ -27,24 +27,29 @@ import org.libreccm.modules.RequiredModule;
 import org.libreccm.modules.ShutdownEvent;
 import org.libreccm.modules.UnInstallEvent;
 import org.libreccm.shortcuts.ui.ShortcutsSettingsPane;
+import org.libreccm.ui.admin.applications.shortcuts.ShortcutsApplicationController;
 import org.libreccm.web.ApplicationType;
 
 /**
- * The {@code Shortcuts} module for CCM. Defines the {@code Shortcuts} 
+ * The {@code Shortcuts} module for CCM. Defines the {@code Shortcuts}
  * application and sets up the module when the module is installed.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Module(
-        requiredModules = {
-            @RequiredModule(module = CcmCore.class)
-        },
-        applicationTypes = {
-            @ApplicationType(name = ShortcutsConstants.SHORTCUTS_APP_TYPE,
-                             descBundle = ShortcutsConstants.SHORTCUTS_BUNDLE,
-                             singleton = true,
-                             settingsPane = ShortcutsSettingsPane.class,
-                             creator = ShortcutsApplicationCreator.class)})
+    requiredModules = {
+        @RequiredModule(module = CcmCore.class)
+    },
+    applicationTypes = {
+        @ApplicationType(
+            name = ShortcutsConstants.SHORTCUTS_APP_TYPE,
+            descBundle = ShortcutsConstants.SHORTCUTS_BUNDLE,
+            singleton = true,
+            settingsPane = ShortcutsSettingsPane.class,
+            creator = ShortcutsApplicationCreator.class,
+            applicationController = ShortcutsApplicationController.class
+        )}
+)
 public class Shortcuts implements CcmModule {
 
     @Override
diff --git a/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java b/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java
index 101a60b0c..5824d0bc5 100644
--- a/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java
+++ b/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java
@@ -18,17 +18,25 @@
  */
 package org.libreccm.ui.admin.applications.shortcuts;
 
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.shortcuts.Shortcut;
 import org.libreccm.shortcuts.ShortcutRepository;
-import org.libreccm.shortcuts.ShortcutsConstants;
 import org.libreccm.ui.admin.applications.ApplicationController;
-import org.libreccm.ui.admin.applications.IsApplicationControllerFor;
+
+import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
+import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 
 /**
  *
@@ -36,8 +44,7 @@ import javax.ws.rs.Path;
  */
 @RequestScoped
 @Controller
-//@IsApplicationControllerFor(ShortcutsConstants.SHORTCUTS_APP_TYPE)
-@Path("/application")
+@Path("/applications/shortcuts")
 public class ShortcutsApplicationController implements ApplicationController {
 
     @Inject
@@ -48,11 +55,74 @@ public class ShortcutsApplicationController implements ApplicationController {
 
     @GET
     @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
     @Override
     public String getApplication() {
         models.put("shortcuts", shortcutRepository.findAll());
-        
+
         return "org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml";
     }
 
+    @POST
+    @Path("/add")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String addShortcut(
+        @FormParam("urlKey") final String urlKey,
+        @FormParam("redirect") final String redirect
+    ) {
+        final Shortcut shortcut = new Shortcut();
+        shortcut.setUrlKey(urlKey);
+        shortcut.setRedirect(redirect);
+        
+        shortcutRepository.save(shortcut);
+        
+        return "redirect:applications/shortcuts";
+    }
+    
+    @POST
+    @Path("/{shortcutId}/edit")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateShortcut(
+        @PathParam("shortcutId") final long shortcutId,
+        @FormParam("urlKey") final String urlKey,
+        @FormParam("redirect") final String redirect
+    ) {
+        final Optional<Shortcut> result = shortcutRepository
+            .findById(shortcutId);
+        
+        if (result.isPresent()) {
+            final Shortcut shortcut = result.get();
+            shortcut.setUrlKey(urlKey);
+            shortcut.setRedirect(redirect);
+            
+            shortcutRepository.save(shortcut);
+        }
+        
+        return "redirect:applications/shortcuts";
+    }
+    
+    @POST
+    @Path("/{shortcutId}/remove")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String removeShortcut(
+        @PathParam("shortcutId") final long shortcutId
+    ) {
+        final Optional<Shortcut> result = shortcutRepository
+            .findById(shortcutId);
+        
+        if (result.isPresent()) {
+            shortcutRepository.delete(result.get());
+        }
+        
+        return "redirect:applications/shortcuts";
+    }
+
 }
diff --git a/ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml b/ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml
index 4b6e0f517..94496f2da 100644
--- a/ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml
+++ b/ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml
@@ -2,7 +2,9 @@
 <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:f="http://xmlns.jcp.org/jsf/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
@@ -17,24 +19,48 @@
                 #{ShortcutAdminMessages['application_title']}
             </li>
         </ui:define>
-        
+
         <ui:define name="main">
             <div class="container">
                 <h1>#{ShortcutAdminMessages['application_title']}</h1>
-                
-                <div class="text-right mb-2">
-                    <a class="btn btn-secondary"
-                       href="#">
-                        <bootstrap:svgIcon icon="plus-circle" />
-                        <span>#{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut']}</span>
-                    </a>
+
+                <div class="mb-2">
+                    <bootstrap:modalForm actionTarget="#{mvc.uri('ShortcutsApplicationController#addShortcut')}"
+                                         buttonIcon="plus-circle"
+                                         buttonText="#{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut']}"
+                                         buttonTextClass="text-right"
+                                         dialogId="shortcuts-add-form">
+                        <f:facet name="title">
+                            <h3>#{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut.dialog.title']}</h3>
+                        </f:facet>
+                        <f:facet name="body">
+                            <bootstrap:formGroupText help="#{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut.dialog.urlkey.help']}"
+                                                     inputId="shortcuts-add-form-urlkey"
+                                                     label="#{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut.dialog.urlkey.label']}" 
+                                                     name="urlKey" />
+                            <bootstrap:formGroupText help="#{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut.dialog.redirect.help']}"
+                                                     inputId="shortcuts-add-form-redirect"
+                                                     label="#{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut.dialog.redirect.label']}" 
+                                                     name="redirect" />
+                        </f:facet>
+                        <f:facet name="footer">
+                            <button class="btn btn-secondary" 
+                                    data-dismiss="modal"
+                                    type="button" >
+                                #{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut.dialog.cancel']}
+                            </button>
+                            <button type="submit" class="btn btn-primary">
+                                #{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut.dialog.submit']}
+                            </button>
+                        </f:facet>
+                    </bootstrap:modalForm>
                 </div>
                 <table class="table table-hover">
                     <thead>
                         <tr>
                             <th>#{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.col_url_key.header']}</th>
                             <th>#{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.col_redirect.header']}</th>
-                            <th class="text-center" colspan="2"><th>#{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.col_actions.header']}</th></th>
+                            <th class="text-center" colspan="2">#{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.col_actions.header']}</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -43,18 +69,46 @@
                                 <td>#{shortcut.urlKey}</td>
                                 <td>#{shortcut.redirect}</td>
                                 <td>
-                                    <a class="btn btn-info" 
-                                       href="#">
-                                           <bootstrap:svgIcon icon="pen"/>
-                                           #{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.edit']}
-                                    </a>
+                                    <bootstrap:modalForm actionTarget="#{mvc.uri('ShortcutsApplicationController#updateShortcut', { 'shortcutId': shortcut.shortcutId })}"
+                                                         buttonIcon="pen"
+                                                         buttonText="#{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.edit']}"
+                                                         buttonTextClass="text-center"
+                                                         dialogId="shortcut-#{shortcut.shortcutId}-edit-form">
+                                        <f:facet name="title">
+                                            <h3>#{ShortcutAdminMessages['shortcuts.ui.admin.edit_shortcut.dialog.title']}</h3>
+                                        </f:facet>
+                                        <f:facet name="body">
+                                            <bootstrap:formGroupText help="#{ShortcutAdminMessages['shortcuts.ui.admin.edit_shortcut.dialog.urlkey.help']}"
+                                                                     inputId="shortcut-#{shortcut.shortcutId}-edit-form-urlkey"
+                                                                     label="#{ShortcutAdminMessages['shortcuts.ui.admin.edit_shortcut.dialog.urlkey.label']}" 
+                                                                     name="urlKey" 
+                                                                     value="#{shortcut.urlKey}" />
+                                            <bootstrap:formGroupText help="#{ShortcutAdminMessages['shortcuts.ui.admin.edit_shortcut.dialog.redirect.help']}"
+                                                                     inputId="shortcut-#{shortcut.shortcutId}-edit-form-redirect"
+                                                                     label="#{ShortcutAdminMessages['shortcuts.ui.admin.edit_shortcut.dialog.redirect.label']}" 
+                                                                     name="redirect"
+                                                                     value="#{shortcut.redirect}" />
+                                        </f:facet>
+                                        <f:facet name="footer">
+                                            <button class="btn btn-secondary" 
+                                                    data-dismiss="modal"
+                                                    type="button" >
+                                                #{ShortcutAdminMessages['shortcuts.ui.admin.edit_shortcut.dialog.cancel']}
+                                            </button>
+                                            <button type="submit" class="btn btn-primary">
+                                                #{ShortcutAdminMessages['shortcuts.ui.admin.edit_shortcut.dialog.submit']}
+                                            </button>
+                                        </f:facet>
+                                    </bootstrap:modalForm>
                                 </td>
                                 <td>
-                                    <a class="btn btn-danger" 
-                                       href="#">
-                                           <bootstrap:svgIcon icon="x-circle"/>
-                                           #{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.delete']}
-                                    </a>
+                                    <libreccm:deleteDialog actionTarget="#{mvc.uri('ShortcutsApplicationController#removeShortcut', { 'shortcutId': shortcut.shortcutId })}" 
+                                                           buttonText="#{ShortcutAdminMessages['shortcuts.ui.admin.shortcuts_table.delete']}"
+                                                           cancelLabel="#{ShortcutAdminMessages['shortcuts.ui.admin.delete_dialog.cancel']}"
+                                                           confirmLabel="#{ShortcutAdminMessages['shortcuts.ui.admin.delete_dialog.confirm']}" 
+                                                           dialogId="remove-shortcut-dialog-#{shortcut.shortcutId}" 
+                                                           dialogTitle="#{ShortcutAdminMessages['shortcuts.ui.admin.delete_dialog.title']}" 
+                                                           message="#{ShortcutAdminMessages.getMessage('shortcuts.ui.admin.delete_dialog.message', [shortcut.urlKey, shortcut.redirect])}"/>
                                 </td>
                             </tr>
                         </c:forEach>
diff --git a/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources.properties b/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources.properties
index 23af7122d..fa449df70 100644
--- a/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources.properties
+++ b/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources.properties
@@ -33,3 +33,20 @@ shortcuts.ui.admin.redirect.error.invalid=The target of the redirect must be a a
 shortcuts.ui.admin.heading=Manage shortcuts 
 shortcuts.ui.admin.table.empty=No shortcuts definied yet
 shortcuts.ui.admin.add_shortcut=Add shortcut
+shortcuts.ui.admin.delete_dialog.cancel=Cancel
+shortcuts.ui.admin.delete_dialog.confirm=Remove shortcut
+shortcuts.ui.admin.delete_dialog.title=Confirm removal of shortcut
+shortcuts.ui.admin.delete_dialog.message=Are you sure to remove the shortcut which redirects the URL {0} to {1}?
+shortcuts.ui.admin.add_shortcut.dialog.title=Add shortcut
+shortcuts.ui.admin.add_shortcut.dialog.urlkey.help=The short URL  to redirect
+shortcuts.ui.admin.add_shortcut.dialog.urlkey.label=Short URL
+shortcuts.ui.admin.add_shortcut.dialog.redirect.help=The target URL to which the user is redirected
+shortcuts.ui.admin.add_shortcut.dialog.redirect.label=Redirect target
+shortcuts.ui.admin.add_shortcut.dialog.cancel=Cancel
+shortcuts.ui.admin.add_shortcut.dialog.submit=Create shortcut
+shortcuts.ui.admin.edit_shortcut.dialog.urlkey.help=The short URL
+shortcuts.ui.admin.edit_shortcut.dialog.urlkey.label=Short URL
+shortcuts.ui.admin.edit_shortcut.dialog.redirect.help=The target URL to which the user is redirected
+shortcuts.ui.admin.edit_shortcut.dialog.redirect.label=Redirect target
+shortcuts.ui.admin.edit_shortcut.dialog.cancel=Cancel
+shortcuts.ui.admin.edit_shortcut.dialog.submit=Save
diff --git a/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources_de.properties b/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources_de.properties
index 5d3b1aaae..d7348a459 100644
--- a/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources_de.properties
+++ b/ccm-shortcuts/src/main/resources/org/libreccm/shortcuts/ShortcutsResources_de.properties
@@ -33,3 +33,20 @@ shortcuts.ui.admin.heading=Shortcuts verwalten
 shortcuts.ui.admin.table.empty=Es wurden noch keine Shortcuts angelegt.
 shortcuts.ui.admin.add_shortcut=Shortcut hinzuf\u00fcgen
 shortcuts.ui.admin.shortcuts_table.col_actions.header=Aktionen
+shortcuts.ui.admin.delete_dialog.cancel=Abbbrechen
+shortcuts.ui.admin.delete_dialog.confirm=Shortcut entfernen
+shortcuts.ui.admin.delete_dialog.title=Confirm removal of shortcut
+shortcuts.ui.admin.delete_dialog.message=Sind Sie sicher, dass  Sie den Shortcut f\u00fcr die Umleitung von {0} nach {1} entfernen wollen?
+shortcuts.ui.admin.add_shortcut.dialog.title=Shortcut hinzuf\u00fcgen
+shortcuts.ui.admin.add_shortcut.dialog.urlkey.help=Die Kurz-URL, die umgeleitetet werden soll
+shortcuts.ui.admin.add_shortcut.dialog.urlkey.label=Kurz-URL
+shortcuts.ui.admin.add_shortcut.dialog.redirect.help=An diese URL wird weitergeleitet.
+shortcuts.ui.admin.add_shortcut.dialog.redirect.label=Weiterleitungsziel
+shortcuts.ui.admin.add_shortcut.dialog.cancel=Abbrechen
+shortcuts.ui.admin.add_shortcut.dialog.submit=Shortcut anlegen
+shortcuts.ui.admin.edit_shortcut.dialog.urlkey.help=Die Kurz-URL, die umgeleitetet werden soll
+shortcuts.ui.admin.edit_shortcut.dialog.urlkey.label=Kurz-URL
+shortcuts.ui.admin.edit_shortcut.dialog.redirect.help=An diese URL wird weitergeleitet.
+shortcuts.ui.admin.edit_shortcut.dialog.redirect.label=Weiterleitungsziel
+shortcuts.ui.admin.edit_shortcut.dialog.cancel=Abbrechen
+shortcuts.ui.admin.edit_shortcut.dialog.submit=Speichern

From 1b4b6e571b2f1329fdeef31d00148c430cfc71cd Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 28 Nov 2020 20:26:04 +0100
Subject: [PATCH 77/93] Content Section management for Admin application

---
 ccm-bundle-devel-wildfly/pom.xml              |   8 ++
 ccm-cms/pom.xml                               |  16 +++
 .../ContentSectionAdminMessages.java          | 127 +++++++++++++++++
 .../ContentSectionApplicationController.java  | 134 ++++++++++++++++++
 .../ContentSectionTableRow.java               |  57 ++++++++
 ccm-cms/src/main/java/org/librecms/Cms.java   |   4 +-
 .../content-sections/content-sections.xhtml   | 115 +++++++++++++++
 .../ContentSectionResources.properties        |  18 +++
 .../ContentSectionResources_de.properties     |  18 +++
 ccm-shortcuts/pom.xml                         |   1 +
 .../shortcuts/ShortcutAdminMessages.java      |   1 -
 .../ShortcutsApplicationController.java       |   5 +-
 12 files changed, 500 insertions(+), 4 deletions(-)
 create mode 100644 ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionAdminMessages.java
 create mode 100644 ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionApplicationController.java
 create mode 100644 ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionTableRow.java
 create mode 100644 ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml

diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml
index 1cdb1c0f4..3fb923da7 100644
--- a/ccm-bundle-devel-wildfly/pom.xml
+++ b/ccm-bundle-devel-wildfly/pom.xml
@@ -232,6 +232,14 @@
                                 <include>resources/</include>
                             </includes>
                         </overlay>
+                        <overlay>
+                            <groupId>org.librecms</groupId>
+                            <artifactId>ccm-cms</artifactId>
+                            <type>jar</type>
+                            <includes>
+                                <include>WEB-INF/</include>
+                            </includes>
+                        </overlay>
                         <overlay>
                             <groupId>org.librecms</groupId>
                             <artifactId>ccm-cms</artifactId>
diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index b2da1d216..9c339d900 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -71,6 +71,22 @@
             <scope>provided</scope>
         </dependency>
         
+        <dependency>
+            <groupId>javax.mvc</groupId>
+            <artifactId>javax.mvc-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.krazo</groupId>
+            <artifactId>krazo-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.krazo.ext</groupId>
+            <artifactId>krazo-freemarker</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionAdminMessages.java b/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionAdminMessages.java
new file mode 100644
index 000000000..6411f3690
--- /dev/null
+++ b/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionAdminMessages.java
@@ -0,0 +1,127 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.libreccm.ui.admin.contentsections;
+
+import org.libreccm.l10n.GlobalizationHelper;
+import org.librecms.CmsConstants;
+
+import java.text.MessageFormat;
+import java.util.AbstractMap;
+import java.util.List;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("ContentSectionAdminMessages")
+public class ContentSectionAdminMessages extends AbstractMap<String, String> {
+
+    /**
+     * Provides access to the locale negoiated by LibreCCM.
+     */
+    @Inject
+    private GlobalizationHelper globalizationHelper;
+
+    /**
+     * The {@link ResourceBundle} to use.
+     */
+    private ResourceBundle messages;
+
+    /**
+     * Loads the resource bundle.
+     */
+    @PostConstruct
+    private void init() {
+        messages = ResourceBundle.getBundle(
+            CmsConstants.CONTENT_SECTION_DESC_BUNDLE,
+            globalizationHelper.getNegotiatedLocale()
+        );
+    }
+
+    /**
+     * Retrieves a message from the resource bundle.
+     *
+     * @param key The key of the message.
+     *
+     * @return The translated message or {@code ???message???} if the the key is
+     *         not found in the resource bundle (message is replaced with the
+     *         key).
+     */
+    public String getMessage(final String key) {
+        if (messages.containsKey(key)) {
+            return messages.getString(key);
+        } else {
+            return String.format("???%s???", key);
+        }
+    }
+
+    /**
+     * Retrieves a message with placeholders.
+     *
+     * @param key        The key of the message.
+     * @param parameters The parameters for the placeholders.
+     *
+     * @return The translated message or {@code ???message???} if the the key is
+     *         not found in the resource bundle (message is replaced with the
+     *         key).
+     */
+    public String getMessage(
+        final String key, final List<Object> parameters
+    ) {
+        return getMessage(key, parameters.toArray());
+    }
+
+    /**
+     * The translated message or {@code ???message???} if the the key is not
+     * found in the resource bundle (message is replaced with the key).
+     *
+     * @param key        The key of the message.
+     * @param parameters The parameters for the placeholders.
+     *
+     * @return The translated message or {@code ???message???} if the the key is
+     *         not found in the resource bundle (message is replaced with the
+     *         key).
+     */
+    public String getMessage(
+        final String key, final Object[] parameters
+    ) {
+        if (messages.containsKey(key)) {
+            return MessageFormat.format(messages.getString(key), parameters);
+        } else {
+            return String.format("???%s???", key);
+        }
+    }
+
+    @Override
+    public String get(final Object key) {
+        return get((String) key);
+    }
+
+    public String get(final String key) {
+        return getMessage(key);
+    }
+
+    @Override
+    public Set<Entry<String, String>> entrySet() {
+        return messages
+            .keySet()
+            .stream()
+            .collect(
+                Collectors.toMap(key -> key, key -> messages.getString(key))
+            )
+            .entrySet();
+    }
+
+}
diff --git a/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionApplicationController.java b/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionApplicationController.java
new file mode 100644
index 000000000..5cc918e27
--- /dev/null
+++ b/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionApplicationController.java
@@ -0,0 +1,134 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.libreccm.ui.admin.contentsections;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.ui.admin.applications.ApplicationController;
+import org.librecms.contentsection.ContentSection;
+import org.librecms.contentsection.ContentSectionManager;
+import org.librecms.contentsection.ContentSectionRepository;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Controller
+@Path("/applications/content-sections")
+public class ContentSectionApplicationController
+    implements ApplicationController {
+
+    @Inject
+    private Models models;
+
+    @Inject
+    private ContentSectionManager sectionManager;
+
+    @Inject
+    private ContentSectionRepository sectionRepository;
+
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    @Override
+    public String getApplication() {
+        final List<ContentSection> contentSections = sectionRepository.findAll();
+
+        models.put(
+            "sections",
+            sectionRepository
+                .findAll()
+                .stream()
+                .map(this::buildContentSectionTableRow)
+                .sorted()
+                .collect(Collectors.toList())
+        );
+
+        return "org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml";
+    }
+
+    @POST
+    @Path("/add")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String addContentSection(
+        @FormParam("label") final String label
+    ) {
+        sectionManager.createContentSection(label);
+
+        return "redirect:applications/content-sections";
+    }
+
+    @POST
+    @Path("/{sectionId}/update")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String updateContentSection(
+        @PathParam("sectionId") final long sectionId,
+        @FormParam("label") final String label
+    ) {
+        final Optional<ContentSection> result = sectionRepository
+            .findById(sectionId);
+
+        if (result.isPresent()) {
+            sectionManager.renameContentSection(result.get(), label);
+        }
+
+        return "redirect:applications/content-sections";
+    }
+
+    @POST
+    @Path("/{sectionId}/delete")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String deleteContentSection(
+        @PathParam("sectionId") final long sectionId,
+        @FormParam("confirmed") final String confirmed
+    ) {
+        final Optional<ContentSection> result = sectionRepository
+            .findById(sectionId);
+
+        if (result.isPresent() && "true".equals(confirmed)) {
+            sectionRepository.delete(result.get());
+        }
+
+        return "redirect:applications/content-sections";
+    }
+
+    private ContentSectionTableRow buildContentSectionTableRow(
+        final ContentSection section
+    ) {
+        final ContentSectionTableRow row = new ContentSectionTableRow();
+        row.setSectionId(section.getObjectId());
+        row.setUuid(section.getUuid());
+        row.setLabel(section.getLabel());
+
+        return row;
+    }
+
+}
diff --git a/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionTableRow.java b/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionTableRow.java
new file mode 100644
index 000000000..35acea6e7
--- /dev/null
+++ b/ccm-cms/src/main/java/org/libreccm/ui/admin/contentsections/ContentSectionTableRow.java
@@ -0,0 +1,57 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.libreccm.ui.admin.contentsections;
+
+import java.util.Comparator;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class ContentSectionTableRow implements
+    Comparable<ContentSectionTableRow> {
+
+    private long sectionId;
+
+    private String uuid;
+
+    private String label;
+
+    public long getSectionId() {
+        return sectionId;
+    }
+
+    protected void setSectionId(long sectionId) {
+        this.sectionId = sectionId;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    protected void setUuid(final String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    protected void setLabel(final String label) {
+        this.label = label;
+    }
+
+    @Override
+    public int compareTo(final ContentSectionTableRow other) {
+        return Comparator
+            .nullsFirst(
+                Comparator
+                    .comparing(ContentSectionTableRow::getLabel)
+                    .thenComparing(ContentSectionTableRow::getSectionId)
+            ).compare(this, other);
+    }
+
+}
diff --git a/ccm-cms/src/main/java/org/librecms/Cms.java b/ccm-cms/src/main/java/org/librecms/Cms.java
index 4d532f286..39a5dbeef 100644
--- a/ccm-cms/src/main/java/org/librecms/Cms.java
+++ b/ccm-cms/src/main/java/org/librecms/Cms.java
@@ -23,6 +23,7 @@ import org.libreccm.modules.RequiredModule;
 import org.libreccm.modules.ShutdownEvent;
 import org.libreccm.modules.UnInstallEvent;
 import org.libreccm.pagemodel.PageModelComponentModel;
+import org.libreccm.ui.admin.contentsections.ContentSectionApplicationController;
 import org.libreccm.web.ApplicationType;
 import org.libreccm.web.CcmApplication;
 import org.librecms.assets.AssetTypes;
@@ -80,7 +81,8 @@ import java.util.Properties;
             settingsPane = SettingsPane.class,
             descBundle = CmsConstants.CONTENT_SECTION_DESC_BUNDLE,
             creator = ContentSectionCreator.class,
-            servletPath = "/templates/servlet/content-section"
+            servletPath = "/templates/servlet/content-section",
+            applicationController = ContentSectionApplicationController.class
         ),
         @ApplicationType(
             name = "org.librecms.pages.Pages",
diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml
new file mode 100644
index 000000000..9f8002d56
--- /dev/null
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/content-sections/content-sections.xhtml
@@ -0,0 +1,115 @@
+<!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:f="http://xmlns.jcp.org/jsf/core"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="applications" />
+        <ui:param name="title" value="#{AdminMessages['applications.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                #{AdminMessages['applications.label']}
+            </li>
+            <li class="breadcrumb-item active">
+                #{ContentSectionAdminMessages['application_title']}
+            </li>
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{ContentSectionAdminMessages['application_title']}</h1>
+
+                <div class="mb-2">
+                    <bootstrap:modalForm actionTarget="#{mvc.uri('ContentSectionApplicationController#addContentSection')}"
+                                         buttonIcon="plus-circle"
+                                         buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.add']}"
+                                         buttonTextClass="text-right"
+                                         dialogId="contentsection-add-form"
+                                         >
+                        <f:facet name="title">
+                            <h3>#{ContentSectionAdminMessages['contentsections.ui.admin.instances.add_form.title']}</h3>
+                        </f:facet>
+                        <f:facet name="body">
+                            <bootstrap:formGroupText help="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.add_form.name.help']}"
+                                                     inputId="contentsection-add-form-name"
+                                                     label="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.add_form.name.label']}" 
+                                                     name="label" 
+                                                     pattern="[\\w-.]"/>
+                        </f:facet>
+                        <f:facet name="footer">
+                            <button class="btn btn-secondary" 
+                                    data-dismiss="modal"
+                                    type="button" >
+                                #{ContentSectionAdminMessages['contentsections.ui.admin.instances.add_form.cancel']}
+                            </button>
+                            <button type="submit" class="btn btn-primary">
+                                #{ContentSectionAdminMessages['contentsections.ui.admin.instances.add_form.submit']}
+                            </button>
+                        </f:facet>
+                    </bootstrap:modalForm>
+                </div>
+
+                <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th>#{ContentSectionAdminMessages['contentsections.ui.admin.instances_table.col_name.header']}</th>
+                            <th class="text-center" colspan="2">#{ContentSectionAdminMessages['contentsections.ui.admin.instances_table.col_name.actions']}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <c:forEach items="#{sections}" var="section">
+                            <tr>
+                                <td>#{section.label}</td>
+                                <td class="text-center">
+                                    <bootstrap:modalForm actionTarget="#{mvc.uri('ContentSectionApplicationController#updateContentSection', { 'sectionId': section.sectionId })}"
+                                                         buttonIcon="plus-circle"
+                                                         buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.edit']}"
+                                                         buttonTextClass="text-right"
+                                                         dialogId="contentsection-#{section.sectionId}-edit-form"
+                                                         >
+                                        <f:facet name="title">
+                                            <h3>#{ContentSectionAdminMessages['contentsections.ui.admin.instances.add_form.title']}</h3>
+                                        </f:facet>
+                                        <f:facet name="body">
+                                            <bootstrap:formGroupText help="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.edit_form.name.help']}"
+                                                                     inputId="contentsection-add-form-name"
+                                                                     label="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.edit_form.name.label']}" 
+                                                                     name="label" 
+                                                                     pattern="[\\w-.]" 
+                                                                     value="#{section.label}" />
+                                        </f:facet>
+                                        <f:facet name="footer">
+                                            <button class="btn btn-secondary" 
+                                                    data-dismiss="modal"
+                                                    type="button" >
+                                                #{ContentSectionAdminMessages['contentsections.ui.admin.instances.edit_form.cancel']}
+                                            </button>
+                                            <button type="submit" class="btn btn-primary">
+                                                #{ContentSectionAdminMessages['contentsections.ui.admin.instances.edit_form.submit']}
+                                            </button>
+                                        </f:facet>
+                                    </bootstrap:modalForm>
+                                </td>
+                                <td class="text-center">
+                                    <libreccm:deleteDialog actionTarget="#{mvc.uri('ContentSectionApplicationController#deleteContentSection', { 'sectionId': section.sectionId })}"
+                                                           buttonText="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.button_text']}" 
+                                                           cancelLabel="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.cancel']}"
+                                                           confirmLabel="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.confirm']}"
+                                                           dialogId="contentsection-#{section.sectionId}-deletedialog"
+                                                           dialogTitle="#{ContentSectionAdminMessages['contentsections.ui.admin.instances.delete_dialog.title']}"
+                                                           message="#{ContentSectionAdminMessages.getMessage('contentsections.ui.admin.instances.delete_dialog.message', [section.label])}" />
+                                </td>
+                            </tr>
+                        </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </ui:define>
+
+    </ui:composition>
+</html>
\ No newline at end of file
diff --git a/ccm-cms/src/main/resources/org/librecms/contentsection/ContentSectionResources.properties b/ccm-cms/src/main/resources/org/librecms/contentsection/ContentSectionResources.properties
index 1c197ca17..3096a0db1 100644
--- a/ccm-cms/src/main/resources/org/librecms/contentsection/ContentSectionResources.properties
+++ b/ccm-cms/src/main/resources/org/librecms/contentsection/ContentSectionResources.properties
@@ -17,3 +17,21 @@
 
 application_title=Content Section
 application_desc=A content section is used to group similar content. 
+contentsections.ui.admin.instances_table.col_name.header=Name
+contentsections.ui.admin.instances_table.col_name.actions=Actions
+contentsections.ui.admin.instances.add_form.title=Create new Content Section
+contentsections.ui.admin.instances.add=Add Content Section
+contentsections.ui.admin.instances.add_form.name.help=The name of the new Content Section. Also used as URL stub, therefore only characters in an URL can be used.
+contentsections.ui.admin.instances.add_form.name.label=Name
+contentsections.ui.admin.instances.add_form.cancel=Cancel
+contentsections.ui.admin.instances.add_form.submit=Create Content Section
+contentsections.ui.admin.instances.delete_dialog.button_text=Delete
+contentsections.ui.admin.instances.delete_dialog.cancel=Cancel
+contentsections.ui.admin.instances.delete_dialog.confirm=Delete Content Section
+contentsections.ui.admin.instances.delete_dialog.title=Content Section l\u00f6schen best\u00e4tigen
+contentsections.ui.admin.instances.delete_dialog.message=Are you sure to delete the Content Section {0}?
+contentsections.ui.admin.instances.edit=Edit
+contentsections.ui.admin.instances.edit_form.name.help=The name of the Content Section. Also used as URL stub, therefore only characters in an URL can be used.
+contentsections.ui.admin.instances.edit_form.name.label=Name
+contentsections.ui.admin.instances.edit_form.cancel=Cancel
+contentsections.ui.admin.instances.edit_form.submit=Save
diff --git a/ccm-cms/src/main/resources/org/librecms/contentsection/ContentSectionResources_de.properties b/ccm-cms/src/main/resources/org/librecms/contentsection/ContentSectionResources_de.properties
index 1c197ca17..490a34f1e 100644
--- a/ccm-cms/src/main/resources/org/librecms/contentsection/ContentSectionResources_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/contentsection/ContentSectionResources_de.properties
@@ -17,3 +17,21 @@
 
 application_title=Content Section
 application_desc=A content section is used to group similar content. 
+contentsections.ui.admin.instances_table.col_name.header=Name
+contentsections.ui.admin.instances_table.col_name.actions=Aktionen
+contentsections.ui.admin.instances.add_form.title=Neue Content Section anlegen
+contentsections.ui.admin.instances.add=Content Section hinzuf\u00fcgen
+contentsections.ui.admin.instances.add_form.name.help=Der Name der neuen Content Section. Wird auch als URL-Fragment genutzt, daher sind Zeichen erlaubt, die in einer URL vorkommen d\u00fcrfen.
+contentsections.ui.admin.instances.add_form.name.label=Name
+contentsections.ui.admin.instances.add_form.cancel=Abbrechen
+contentsections.ui.admin.instances.add_form.submit=Content Section anlegen
+contentsections.ui.admin.instances.delete_dialog.button_text=L\u00f6schen
+contentsections.ui.admin.instances.delete_dialog.cancel=Abbrechen
+contentsections.ui.admin.instances.delete_dialog.confirm=Content Section l\u00f6schen
+contentsections.ui.admin.instances.delete_dialog.title=Content Section l\u00f6schen best\u00e4tigen
+contentsections.ui.admin.instances.delete_dialog.message=Sind Sie sicher dass Sie die Content Section {0} l\u00f6schen wollen?
+contentsections.ui.admin.instances.edit=Bearbeiten
+contentsections.ui.admin.instances.edit_form.name.help=Der Name der Content Section. Wird auch als URL-Fragment genutzt, daher sind Zeichen erlaubt, die in einer URL vorkommen d\u00fcrfen.
+contentsections.ui.admin.instances.edit_form.name.label=Name
+contentsections.ui.admin.instances.edit_form.cancel=Abbrechen
+contentsections.ui.admin.instances.edit_form.submit=Speichern
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index 92b3992c7..fc21ab4ff 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -76,6 +76,7 @@
          <dependency>
             <groupId>javax.mvc</groupId>
             <artifactId>javax.mvc-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.krazo</groupId>
diff --git a/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutAdminMessages.java b/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutAdminMessages.java
index 0d65d7cd1..29ccbb774 100644
--- a/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutAdminMessages.java
+++ b/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutAdminMessages.java
@@ -20,7 +20,6 @@ package org.libreccm.ui.admin.applications.shortcuts;
 
 import org.libreccm.l10n.GlobalizationHelper;
 import org.libreccm.shortcuts.ShortcutsConstants;
-import org.libreccm.ui.admin.AdminConstants;
 
 import java.text.MessageFormat;
 import java.util.AbstractMap;
diff --git a/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java b/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java
index 5824d0bc5..3a2eafe9f 100644
--- a/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java
+++ b/ccm-shortcuts/src/main/java/org/libreccm/ui/admin/applications/shortcuts/ShortcutsApplicationController.java
@@ -113,12 +113,13 @@ public class ShortcutsApplicationController implements ApplicationController {
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
     public String removeShortcut(
-        @PathParam("shortcutId") final long shortcutId
+        @PathParam("shortcutId") final long shortcutId,
+        @FormParam("confirmed") final String confirmed
     ) {
         final Optional<Shortcut> result = shortcutRepository
             .findById(shortcutId);
         
-        if (result.isPresent()) {
+        if (result.isPresent() && "true".equals(confirmed)) {
             shortcutRepository.delete(result.get());
         }
         

From 2d5f0fc2a19360096cd82f97afb26ccfba5eaa4c Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 29 Nov 2020 12:05:24 +0100
Subject: [PATCH 78/93] Admin Dashboard

---
 .../org/libreccm/ui/admin/AdminPageModel.java | 36 ++++++++++++---
 .../libreccm/ui/admin/AdminPagesModel.java    |  1 +
 .../org/libreccm/ui/admin/dashboard.xhtml     | 44 ++++++++++++++++---
 3 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
index f8d6ac2b6..40eaf8b96 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPageModel.java
@@ -18,14 +18,16 @@
  */
 package org.libreccm.ui.admin;
 
+import java.util.Comparator;
+
 /**
  * Model for the data of an admin page.
- * 
+ *
  * @see AdminPage
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class AdminPageModel {
+public class AdminPageModel implements Comparable<AdminPageModel> {
 
     private String uriIdentifier;
 
@@ -35,11 +37,13 @@ public class AdminPageModel {
 
     private String icon;
 
+    private long position;
+
     public String getUriIdentifier() {
         return uriIdentifier;
     }
 
-    public void setUriIdentifier(final String uriIdentifier) {
+    protected void setUriIdentifier(final String uriIdentifier) {
         this.uriIdentifier = uriIdentifier;
     }
 
@@ -47,7 +51,7 @@ public class AdminPageModel {
         return label;
     }
 
-    public void setLabel(final String label) {
+    protected void setLabel(final String label) {
         this.label = label;
     }
 
@@ -55,7 +59,7 @@ public class AdminPageModel {
         return description;
     }
 
-    public void setDescription(final String description) {
+    protected void setDescription(final String description) {
         this.description = description;
     }
 
@@ -63,8 +67,26 @@ public class AdminPageModel {
         return icon;
     }
 
-    public void setIcon(final String icon) {
+    protected void setIcon(final String icon) {
         this.icon = icon;
     }
 
+    public long getPosition() {
+        return position;
+    }
+
+    protected void setPosition(final long position) {
+        this.position = position;
+    }
+
+    @Override
+    public int compareTo(final AdminPageModel other) {
+        return Comparator
+            .nullsFirst(
+                Comparator
+                    .comparing(AdminPageModel::getPosition)
+                    .thenComparing(AdminPageModel::getLabel)
+            ).compare(this, other);
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
index 75eca2dea..d459d5a44 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/AdminPagesModel.java
@@ -89,6 +89,7 @@ public class AdminPagesModel {
             )
         );
         model.setIcon(fromAdminPage.getIcon());
+        model.setPosition(fromAdminPage.getPosition());
         return model;
     }
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
index a77b8a7b7..3412d81c1 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/dashboard.xhtml
@@ -1,22 +1,52 @@
 <!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:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:xlink="http://www.w3.org/1999/xlink">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
-        
+
         <ui:param name="activePage" value="/" />
         <ui:param name="title" value="#{AdminMessages['dashboard.label']}" />
-        
+
         <ui:define name="breadcrumb">
         </ui:define>
-        
+
         <ui:define name="main">
-            <div class="container">
+            <div class="container-fluid">
                 <h1>#{AdminMessages['dashboard.label']}</h1>
-                <p>Placeholder</p>
+                <div class="row row-cols-1 row-cols-sm-1 row-cols-sm-2 row-cols-md-3 row-cols-lg-4 row-cols-xl-5">
+                    <c:forEach begin="1"
+                               items="#{AdminPagesModel.adminPages}" 
+                               var="page">
+                        <div class="col mb-4">
+                            <div aria-describedby="admin-page-#{page.position}-body" 
+                                 class="card pt-2"
+                                 id="admin-page-#{page.position}">
+                                <svg aria-hidden="true"
+                                     class="card-img-top"
+                                     fill="currentColor">
+                                    <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg##{page.icon}" />
+                                </svg>
+                                <div class="card-body"
+                                     id="admin-page-#{page.uriIdentifier}-body">
+                                    <h2 class="card-title">
+                                        <a class="stretched-link"
+                                           href="#{mvc.uri(page.uriIdentifier)}">
+                                            #{page.label}
+                                        </a>
+                                    </h2>
+                                    <p class="card-text">
+                                        #{page.description}
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+                    </c:forEach>
+                </div>
             </div>
         </ui:define>
-    
+
     </ui:composition>
 </html>

From b3e28eade103e6c033a7875c035b060f439b07a3 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 1 Dec 2020 20:42:52 +0100
Subject: [PATCH 79/93] Theme Management via Admin UI

---
 .../theming/FileSystemThemeProvider.java      |   5 +
 .../libreccm/theming/StaticThemeProvider.java |   5 +
 .../org/libreccm/theming/ThemeProvider.java   |   6 +
 .../java/org/libreccm/theming/Themes.java     | 127 +++++++++++++
 .../theming/db/DatabaseThemeProvider.java     |   8 +-
 .../applications/ApplicationsController.java  |   1 -
 .../admin/applications/ApplicationsPage.java  |  10 +-
 .../SystemInformationPage.java                |   3 +-
 .../ui/admin/themes/ThemesController.java     | 117 ++++++++++++
 .../libreccm/ui/admin/themes/ThemesModel.java | 126 +++++++++++++
 .../libreccm/ui/admin/themes/ThemesPage.java  |  82 +++++++++
 .../ui/admin/themes/ThemesTableRow.java       | 148 +++++++++++++++
 .../org/libreccm/ui/admin/themes/themes.xhtml | 168 ++++++++++++++++++
 .../org/libreccm/ui/AdminBundle.properties    |  33 ++++
 .../org/libreccm/ui/AdminBundle_de.properties |  33 ++++
 15 files changed, 861 insertions(+), 11 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesController.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesModel.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesPage.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesTableRow.java
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/themes/themes.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/theming/FileSystemThemeProvider.java b/ccm-core/src/main/java/org/libreccm/theming/FileSystemThemeProvider.java
index 7a3c1b3ce..00dde8161 100644
--- a/ccm-core/src/main/java/org/libreccm/theming/FileSystemThemeProvider.java
+++ b/ccm-core/src/main/java/org/libreccm/theming/FileSystemThemeProvider.java
@@ -77,6 +77,11 @@ public class FileSystemThemeProvider implements ThemeProvider {
     @Inject
     private ThemeFileInfoUtil themeFileInfoUtil;
 
+    @Override
+    public String getName() {
+        return "FileSystemThemeProvider";
+    }
+    
     @Override
     public List<ThemeInfo> getThemes() {
 
diff --git a/ccm-core/src/main/java/org/libreccm/theming/StaticThemeProvider.java b/ccm-core/src/main/java/org/libreccm/theming/StaticThemeProvider.java
index 3a8836b7e..ed89e5afd 100644
--- a/ccm-core/src/main/java/org/libreccm/theming/StaticThemeProvider.java
+++ b/ccm-core/src/main/java/org/libreccm/theming/StaticThemeProvider.java
@@ -80,6 +80,11 @@ public class StaticThemeProvider implements ThemeProvider {
     @Inject
     private ThemeFileInfoUtil themeFileInfoUtil;
 
+    @Override
+    public String getName() {
+        return "StaticThemeProvider";
+    }
+    
     @Override
     public List<ThemeInfo> getThemes() {
 
diff --git a/ccm-core/src/main/java/org/libreccm/theming/ThemeProvider.java b/ccm-core/src/main/java/org/libreccm/theming/ThemeProvider.java
index 451e4b683..885424340 100644
--- a/ccm-core/src/main/java/org/libreccm/theming/ThemeProvider.java
+++ b/ccm-core/src/main/java/org/libreccm/theming/ThemeProvider.java
@@ -36,6 +36,12 @@ import javax.enterprise.context.RequestScoped;
  */
 public interface ThemeProvider extends Serializable {
 
+    /**
+     * A human readable name for the {@code ThemeProvider} implementation.
+     * @return 
+     */
+    String getName();
+    
     /**
      * Provides a list of all themes provided by this theme provider. The list
      * should be ordered by the name of the theme.
diff --git a/ccm-core/src/main/java/org/libreccm/theming/Themes.java b/ccm-core/src/main/java/org/libreccm/theming/Themes.java
index fcf2a4eae..8601065d7 100644
--- a/ccm-core/src/main/java/org/libreccm/theming/Themes.java
+++ b/ccm-core/src/main/java/org/libreccm/theming/Themes.java
@@ -28,7 +28,9 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Any;
@@ -53,6 +55,7 @@ public class Themes implements Serializable {
     @Any
     private Instance<ThemeProvider> providers;
 //
+
     @Inject
     private ThemeProcessors themeProcessors;
 
@@ -108,6 +111,100 @@ public class Themes implements Serializable {
         return Optional.empty();
     }
 
+    public List<ThemeProvider> getThemeProviders() {
+        return providers
+            .stream()
+            .collect(Collectors.toList());
+    }
+
+    public Optional<ThemeProvider> findThemeProviderInstance(
+        final Class<? extends ThemeProvider> ofClazz
+    ) {
+        final Instance<? extends ThemeProvider> instance = providers
+            .select(ofClazz);
+        if (instance.isResolvable()) {
+            return Optional.of(instance.get());
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    public ThemeInfo createTheme(
+        final String themeName, final String providerName
+    ) {
+        final Class<ThemeProvider> providerClass = getThemeProviderClass(
+            providerName
+        );
+
+        return createTheme(
+            themeName,
+            findThemeProviderInstance(providerClass).orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "No instance of ThemeProvider implementation %s available.",
+                        providerName
+                    )
+                )
+            )
+        );
+    }
+
+    public ThemeInfo createTheme(
+        final String themeName, final ThemeProvider themeProvider
+    ) {
+        return themeProvider.createTheme(themeName);
+    }
+
+    public void deleteTheme(final String themeName) {
+        final Optional<ThemeProvider> provider = findProviderOfTheme(
+            Objects.requireNonNull(
+                themeName,
+                "Can't delete theme null."
+            )
+        );
+
+        if (provider.isPresent()) {
+            provider.get().deleteTheme(themeName);
+        } else {
+            throw new IllegalArgumentException(
+                String.format(
+                    "No provider providing a theme named %s found.",
+                    themeName
+                )
+            );
+        }
+    }
+
+    public void publishTheme(final String themeName) {
+        final Optional<ThemeProvider> provider = findProviderOfTheme(themeName);
+
+        if (provider.isPresent()) {
+            provider.get().publishTheme(themeName);
+        } else {
+            throw new IllegalArgumentException(
+                String.format(
+                    "No provider providing a theme named %s found.",
+                    themeName
+                )
+            );
+        }
+    }
+
+    public void unpublishTheme(final String themeName) {
+        final Optional<ThemeProvider> provider = findProviderOfTheme(themeName);
+
+        if (provider.isPresent()) {
+            provider.get().unpublishTheme(themeName);
+        } else {
+            throw new IllegalArgumentException(
+                String.format(
+                    "No provider providing a theme named %s found.",
+                    themeName
+                )
+            );
+        }
+    }
+
     /**
      * Creates HTML from the result of rendering a {@link PageModel}.
      *
@@ -240,7 +337,37 @@ public class Themes implements Serializable {
 
         final ThemeProvider provider = forTheme.get();
         provider.deleteThemeFile(theme.getName(), path);
+    }
 
+    @SuppressWarnings("unchecked")
+    private Class<ThemeProvider> getThemeProviderClass(
+        final String providerName
+    ) {
+        try {
+            return (Class<ThemeProvider>) Class.forName(providerName);
+        } catch (ClassNotFoundException ex) {
+            throw new IllegalArgumentException(
+                String.format(
+                    "No ThemeProvider implementation %s available.",
+                    providerName
+                )
+            );
+        }
+    }
+
+    private Optional<ThemeProvider> findProviderOfTheme(
+        final String themeName
+    ) {
+        final List<ThemeProvider> providersList = new ArrayList<>();
+        providers.forEach(provider -> providersList.add(provider));
+
+        return providersList
+            .stream()
+            .filter(
+                current -> current.providesTheme(
+                    themeName, ThemeVersion.DRAFT
+                )
+            ).findAny();
     }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/theming/db/DatabaseThemeProvider.java b/ccm-core/src/main/java/org/libreccm/theming/db/DatabaseThemeProvider.java
index 7f6bf54c0..bceb2da3c 100644
--- a/ccm-core/src/main/java/org/libreccm/theming/db/DatabaseThemeProvider.java
+++ b/ccm-core/src/main/java/org/libreccm/theming/db/DatabaseThemeProvider.java
@@ -71,6 +71,11 @@ public class DatabaseThemeProvider implements ThemeProvider {
     @Inject
     private ThemeRepository themeRepository;
 
+    @Override
+    public String getName() {
+        return "DatabaseThemeProvider";
+    }
+
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     public List<ThemeInfo> getThemes() {
@@ -193,7 +198,7 @@ public class DatabaseThemeProvider implements ThemeProvider {
 
         final Optional<ThemeFile> themeFile = fileRepository
             .findByPath(theme, path, version);
-        
+
         if (themeFile.isPresent()) {
             return Optional.of(createThemeFileInfo(themeFile.get()));
         } else {
@@ -419,6 +424,7 @@ public class DatabaseThemeProvider implements ThemeProvider {
     private class DataFileOutputStream extends OutputStream {
 
         private final DataFile dataFile;
+
         private final ByteArrayOutputStream outputStream;
 
         private DataFileOutputStream(final DataFile dataFile) {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
index b94ec271c..8a5f4200f 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
@@ -35,7 +35,6 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
-import javax.mvc.MvcContext;
 import javax.transaction.Transactional;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
index d55460afb..499a14483 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
@@ -37,10 +37,6 @@ import javax.inject.Inject;
  */
 @ApplicationScoped
 public class ApplicationsPage implements AdminPage {
-    
-    private static final Logger LOGGER = LogManager.getLogger(
-        ApplicationsPage.class
-    );
 
     @Inject
     private ApplicationManager applicationManager;
@@ -49,7 +45,7 @@ public class ApplicationsPage implements AdminPage {
     public Set<Class<?>> getControllerClasses() {
         final Set<Class<?>> classes = new HashSet<>();
         classes.add(ApplicationsController.class);
-        
+
         classes.addAll(
             applicationManager
                 .getApplicationTypes()
@@ -65,8 +61,8 @@ public class ApplicationsPage implements AdminPage {
     @Override
     public String getUriIdentifier() {
         return String.format(
-            "%s#getApplicationTypes", ApplicationsController.class
-                .getSimpleName()
+            "%s#getApplicationTypes",
+            ApplicationsController.class.getSimpleName()
         );
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
index bacaa0888..b2fcb5a73 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
@@ -23,7 +23,6 @@ import java.util.Set;
 
 import org.libreccm.ui.admin.AdminConstants;
 import org.libreccm.ui.admin.AdminPage;
-import org.libreccm.ui.admin.imexport.ImExportController;
 
 import javax.enterprise.context.ApplicationScoped;
 
@@ -76,7 +75,7 @@ public class SystemInformationPage implements AdminPage {
 
     @Override
     public int getPosition() {
-        return 70;
+        return 80;
     }
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesController.java
new file mode 100644
index 000000000..f3ed452cb
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesController.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.themes;
+
+import org.libreccm.core.CoreConstants;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+import org.libreccm.theming.ThemeInfo;
+import org.libreccm.theming.Themes;
+import org.libreccm.theming.manager.ThemeManager;
+;
+
+import java.util.List;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.mvc.Controller;
+import javax.mvc.Models;
+import javax.transaction.Transactional;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+
+
+@RequestScoped
+@Controller
+@Path("/themes")
+public class ThemesController {
+
+    @Inject
+    private Themes themes;
+
+  
+    @Inject
+    private Models models;
+
+    @GET
+    @Path("/")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String getThemes() {
+        return "org/libreccm/ui/admin/themes/themes.xhtml";
+    }
+
+    @POST
+    @Path("/new")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String createTheme(
+        @FormParam("themeName") final String themeName,
+        @FormParam("providerName") final String providerName
+    ) {
+        themes.createTheme(themeName, providerName);
+        
+        return "redirect:themes/";
+    }
+    
+    @POST
+    @Path("/{themeName}/publish")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String publishTheme(final String themeName) {
+        themes.publishTheme(themeName);
+        
+        return "redirect:themes/";
+    }
+    
+    @POST
+    @Path("/{themeName}/unpublish")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String unpublishTheme(final String themeName) {
+        themes.unpublishTheme(themeName);
+        
+        return "redirect:themes/";
+    }
+    
+    @POST
+    @Path("/{themeName}/delete")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String deleteTheme(@PathParam("themeName") final String themeName) {
+        themes.deleteTheme(themeName);
+        
+        return "redirect:themes/";
+    }
+
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesModel.java
new file mode 100644
index 000000000..fc6c32ee5
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesModel.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.themes;
+
+import org.libreccm.l10n.GlobalizationHelper;
+import org.libreccm.l10n.LocalizedTextsUtil;
+import org.libreccm.theming.ThemeInfo;
+import org.libreccm.theming.ThemeProvider;
+import org.libreccm.theming.ThemeVersion;
+import org.libreccm.theming.Themes;
+import org.libreccm.ui.admin.AdminConstants;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Named("Themes")
+public class ThemesModel {
+
+    @Inject
+    private GlobalizationHelper globalizationHelper;
+
+    @Inject
+    private Themes themes;
+
+    public List<ThemesTableRow> getThemes() {
+        return themes
+            .getAvailableThemes()
+            .stream()
+            .map(this::mapThemeInfo)
+            .collect(Collectors.toList());
+    }
+
+    public Map<String, String> getProviderOptions() {
+        return themes
+            .getThemeProviders()
+            .stream()
+            .filter(ThemeProvider::supportsChanges)
+            .filter(ThemeProvider::supportsDraftThemes)
+            .collect(
+                Collectors.toMap(
+                    provider -> provider.getClass().getName(),
+                    provider -> provider.getName()
+                )
+            );
+    }
+
+    private ThemesTableRow mapThemeInfo(final ThemeInfo themeInfo) {
+
+        final LocalizedTextsUtil textsUtil = globalizationHelper
+            .getLocalizedTextsUtil(AdminConstants.ADMIN_BUNDLE);
+
+        final ThemesTableRow row = new ThemesTableRow();
+        row.setDescription(
+            Optional
+                .ofNullable(themeInfo.getManifest().getDescription())
+                .map(ls -> globalizationHelper.getValueFromLocalizedString(ls))
+                .orElse("")
+        );
+        row.setName(themeInfo.getName());
+        row.setProvider(themeInfo.getProvider().getName());
+        row.setTitle(
+            Optional
+                .ofNullable(themeInfo.getManifest().getTitle())
+                .map(ls -> globalizationHelper.getValueFromLocalizedString(ls))
+                .orElse("")
+        );
+        row.setType(themeInfo.getType());
+        row.setVersion(
+            textsUtil.getText(
+                String.format(
+                    "themes.versions.%s",
+                    Objects.toString(
+                        themeInfo.getVersion()).toLowerCase(Locale.ROOT)
+                )
+            )
+        );
+
+        row.setPublished(themeInfo.getVersion() == ThemeVersion.LIVE);
+
+        final Optional<ThemeProvider> themeProviderResult = themes
+            .findThemeProviderInstance(themeInfo.getProvider());
+        if (themeProviderResult.isPresent()) {
+            final ThemeProvider themeProvider = themeProviderResult.get();
+
+            row.setEditable(themeProvider.supportsChanges());
+            row.setPublishable(themeProvider.supportsDraftThemes());
+        } else {
+            row.setEditable(false);
+            row.setPublishable(false);
+        }
+
+        return row;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesPage.java
new file mode 100644
index 000000000..eacd43de9
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesPage.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.themes;
+
+import org.libreccm.ui.admin.AdminConstants;
+import org.libreccm.ui.admin.AdminPage;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@ApplicationScoped
+public class ThemesPage implements AdminPage {
+
+    @Override
+    public Set<Class<?>> getControllerClasses() {
+        final Set<Class<?>> classes = new HashSet<>();
+        classes.add(ThemesController.class);
+        return classes;
+    }
+
+    @Override
+    public String getUriIdentifier() {
+        return String.format(
+            "%s#getThemes", ThemesController.class.getSimpleName()
+        );
+    }
+
+    @Override
+    public String getLabelBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getLabelKey() {
+        return "themes.label";
+    }
+
+    @Override
+    public String getDescriptionBundle() {
+        return AdminConstants.ADMIN_BUNDLE;
+    }
+
+    @Override
+    public String getDescriptionKey() {
+        return "themes.description";
+    }
+
+    @Override
+    public String getIcon() {
+        return "brush-fill";
+    }
+
+    @Override
+    public int getPosition() {
+        return 70;
+    }
+    
+    
+    
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesTableRow.java b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesTableRow.java
new file mode 100644
index 000000000..b0b523a58
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesTableRow.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.themes;
+
+import org.libreccm.theming.ThemeVersion;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class ThemesTableRow implements Comparable<ThemesTableRow>, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String name;
+
+    private String type;
+
+    private ThemeVersion themeVersion;
+
+    private String version;
+
+    private String provider;
+
+    private String title;
+
+    private String description;
+
+    private boolean editable;
+
+    private boolean publishable;
+
+    private boolean published;
+
+    public String getName() {
+        return name;
+    }
+
+    protected void setName(final String name) {
+        this.name = name;
+    }
+
+    public ThemeVersion getThemeVersion() {
+        return themeVersion;
+    }
+
+    protected void setThemeVersion(final ThemeVersion themeVersion) {
+        this.themeVersion = themeVersion;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    protected void setType(final String type) {
+        this.type = type;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    protected void setVersion(final String version) {
+        this.version = version;
+    }
+
+    public String getProvider() {
+        return provider;
+    }
+
+    protected void setProvider(final String provider) {
+        this.provider = provider;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    protected void setTitle(final String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    protected void setDescription(final String description) {
+        this.description = description;
+    }
+
+    public boolean isEditable() {
+        return editable;
+    }
+
+    protected void setEditable(final boolean editable) {
+        this.editable = editable;
+    }
+
+    public boolean isPublishable() {
+        return publishable;
+    }
+
+    protected void setPublishable(final boolean publishable) {
+        this.publishable = publishable;
+    }
+
+    public boolean isPublished() {
+        return published;
+    }
+
+    protected void setPublished(final boolean published) {
+        this.published = published;
+    }
+
+    @Override
+    public int compareTo(final ThemesTableRow other) {
+        return Comparator.nullsFirst(Comparator
+            .comparing(ThemesTableRow::getTitle)
+            .thenComparing(ThemesTableRow::getName)
+            .thenComparing(ThemesTableRow::getVersion)
+            .thenComparing(ThemesTableRow::getType)
+            .thenComparing(ThemesTableRow::getProvider)
+            .thenComparing(ThemesTableRow::isPublishable)
+            .thenComparing(ThemesTableRow::isPublished)
+            .thenComparing(ThemesTableRow::isEditable)
+        ).compare(this, other);
+    }
+
+}
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/themes/themes.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/themes/themes.xhtml
new file mode 100644
index 000000000..c14dd1ee0
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/themes/themes.xhtml
@@ -0,0 +1,168 @@
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
+<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:f="http://xmlns.jcp.org/jsf/core"
+      xmlns:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="applications" />
+        <ui:param name="title" value="#{AdminMessages['applications.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item active">
+                #{AdminMessages['themes.label']}
+            </li>
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container-fluid">
+                <h1>#{AdminMessages['themes.label']}</h1>
+
+                <bootstrap:modalForm actionTarget="#{mvc.uri('ThemesController#createTheme')}"
+                                     buttonIcon="plus-circle"
+                                     buttonText="#{AdminMessages['themes.create_new_theme']}"
+                                     buttonTextClass="text-right"
+                                     dialogId="create-theme-dialog">
+                    <f:facet name="title">
+                        <h2>#{AdminMessages['themes.dialog.new_theme.title']}</h2>
+                    </f:facet>
+                    <f:facet name="body">
+                        <bootstrap:formGroupText help="#{AdminMessages['themes.dialog.new_theme.name.help']}"
+                                                 inputId="create-theme-dialog-name"
+                                                 label="#{AdminMessages['themes.dialog.new_theme.name.label']}"
+                                                 name="themeName" />
+                        <bootstrap:formGroupSelect help="#{AdminMessages['themes.dialog.new_theme.provider.help']}"
+                                                   inputId="create-theme-dialog-provider"
+                                                   label="#{AdminMessages['themes.dialog.new_theme.provider.label']}"
+                                                   name="providerName"
+                                                   options="#{Themes.providerOptions}">
+                        </bootstrap:formGroupSelect>
+                    </f:facet>
+                    <f:facet name="footer">
+                         <button class="btn btn-secondary" 
+                                    data-dismiss="modal"
+                                    type="button" >
+                                #{AdminMessages['themes.dialog.new_theme.close']}
+                            </button>
+                            <button type="submit" class="btn btn-primary">
+                                #{AdminMessages['themes.dialog.new_theme.create']}
+                            </button>
+                    </f:facet>
+                </bootstrap:modalForm>
+                <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th>#{AdminMessages['themes.table.headers.name']}</th>
+                            <th>#{AdminMessages['themes.table.headers.title']}</th>
+                            <th>#{AdminMessages['themes.table.headers.version']}</th>
+                            <th>#{AdminMessages['themes.table.headers.type']}</th>
+                            <th>#{AdminMessages['themes.table.headers.provider']}</th>
+                            <th class="text-center" colspan="4">#{AdminMessages['themes.table.headers.actions']}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <c:forEach items="#{Themes.themes}" var="theme">
+                            <tr>
+                                <td>#{theme.name}</td>
+                                <td>#{theme.title}</td>
+                                <td>#{theme.version}</td>
+                                <td>#{theme.type}</td>
+                                <td>#{theme.provider}</td>
+                                <td>
+                                    <c:if test="#{theme.description != null and !theme.description.isEmpty()}">
+                                        <button class="btn btn-info"
+                                                data-target="#theme-#{theme.name}-description"
+                                                data-toggle="modal"
+                                                type="button">
+                                            <bootstrap:svgIcon icon="info-circle" />
+                                            <span class="sr-only">#{AdminMessages.getMessage('themes.table.description.show', [theme.name])}</span>
+                                        </button>
+                                        <div aria-labelledby="theme-#{theme.name}-description-title"
+                                             aria-hidden="true"
+                                            class="modal fade"
+                                             id="theme-#{theme.name}-description"
+                                             tabindex="-1">
+                                            <div class="modal-dialog">
+                                                <div class="modal-content">
+                                                    <div class="modal-header"
+                                                         id="theme-#{theme.name}-description-title">
+                                                        <h2>#{AdminMessages.getMessage('themes.dialog.description.title', [theme.name])}</h2>
+                                                        <button aria-label="#{AdminMessages['themes.dialog.description.close']}"
+                                                            class="close"
+                                                                data-dismiss="modal"
+                                                                type="button">
+                                                                      <span aria-hidden="true">&times;</span>
+                                                        </button>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <p>
+                                                            #{theme.description}
+                                                        </p>
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button class="btn btn-primary"
+                                                                data-dismiss="modal"
+                                                                type="button">
+                                                            #{AdminMessages['themes.dialog.description.close']}
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </c:if>
+                                </td>
+                                <td>
+                                    <c:choose>
+                                        <c:when test="#{theme.publishable and theme.published }">
+                                            <form action="#{mvc.uri('ThemesController#publishTheme', {'themeName': theme.name})}">
+                                                <button class="btn btn-primary"
+                                                        type="button">
+                                                            #{AdminMessages['themes.table.actions.republish']}
+                                                </button>
+                                            </form>
+                                        </c:when>
+                                        <c:when test="#{theme.publishable}">
+                                            <form action="#{mvc.uri('ThemesController#publishTheme', {'themeName': theme.name})}">
+                                                <button class="btn btn-primary"
+                                                        type="button">
+                                                            #{AdminMessages['themes.table.actions.publish']}
+                                                </button>
+                                            </form>
+                                        </c:when>
+                                    </c:choose>
+                                </td>
+                                <td>
+                                    <c:if test="#{theme.published and theme.publishable}">
+                                        <libreccm:deleteDialog actionTarget="#{mvc.uri('ThemesController#unpublishTheme', {'themeName': theme.name})}"
+                                                               buttonText="#{AdminMessages['themes.table.actions.unpublish']}"
+                                                               cancelLabel="#{AdminMessages['themes.table.actions.unpublish.cancel']}"
+                                                               confirmLabel="#{AdminMessages['themes.table.actions.unpublish.confirm']}"
+                                                               dialogId="theme-#{theme.name}-unpublish"
+                                                               dialogTitle="#{AdminMessages['themes.table.actions.unpublish.title']}"
+                                                               message="#{AdminMessages.getMessage('themes.table.actions.unpublish.message', [theme.name])}"
+                                            />
+                                    </c:if>
+                                </td>
+                                <td>
+                                    <c:if test="#{theme.editable and !theme.published}">
+                                        <libreccm:deleteDialog actionTarget="#{mvc.uri('ThemesController#deleteTheme', {'themeName': theme.name})}"
+                                                               buttonText="#{AdminMessages['themes.table.actions.delete']}"
+                                                               cancelLabel="#{AdminMessages['themes.table.actions.delete.cancel']}"
+                                                               confirmLabel="#{AdminMessages['themes.table.actions.delete.confirm']}"
+                                                               dialogId="theme-#{theme.name}-unpublish"
+                                                               dialogTitle="#{AdminMessages['themes.table.actions.delete.title']}"
+                                                               message="#{AdminMessages.getMessage('themes.table.actions.delete.message', [theme.name])}"
+                                            />
+                                    </c:if>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </ui:define>
+
+    </ui:composition>
+</html>
\ No newline at end of file
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 7bf9becf9..ca1a32d5b 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -493,3 +493,36 @@ sites.form.buttons.save=Save
 applications.types.singleton=Singleton
 applications.number_of_instances={0} instances
 applications.number_of_instances_one={0} instance
+themes.label=Themes
+themes.description=Manage themes
+themes.table.headers.name=Name
+themes.table.headers.title=Title
+themes.table.headers.version=Version
+themes.table.headers.type=Type
+themes.table.headers.provider=Provided by
+themes.table.actions.republish=Republish
+themes.table.actions.publish=Publish
+themes.table.actions.unpublish=Unpublish
+themes.table.actions.delete=Delete
+themes.versions.live=Live
+themes.versions.draft=Draft
+themes.table.headers.actions=Actions
+themes.dialog.description.title=Description of theme {0}
+themes.dialog.description.close=Close
+themes.table.description.show=Show description of theme {0}
+themes.create_new_theme=Create new theme
+themes.dialog.new_theme.title=Create new theme
+themes.dialog.new_theme.close=Cancel
+themes.dialog.new_theme.create=Create new theme
+themes.dialog.new_theme.name.help=Unique name of the new theme
+themes.dialog.new_theme.name.label=Name
+themes.dialog.new_theme.provider.help=The provider which manages the theme.
+themes.dialog.new_theme.provider.label=Provider
+themes.table.actions.unpublish.cancel=Cancel
+themes.table.actions.unpublish.confirm=Unpublish theme
+themes.table.actions.unpublish.title=Confirm to unpublish theme
+themes.table.actions.unpublish.message=Are your sure to unpublish theme {0}?
+themes.table.actions.delete.cancel=Cancel
+themes.table.actions.delete.confirm=Delete theme
+themes.table.actions.delete.title=Confirm theme deletion
+themes.table.actions.delete.message=Are you sure to delete the theme {0}?
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 3829640f5..e82e6aa5c 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -493,3 +493,36 @@ sites.form.buttons.save=Speichern
 applications.types.singleton=Singleton
 applications.number_of_instances={0} Instanzen
 applications.number_of_instances_one={0} instance
+themes.label=Themes
+themes.description=Themes verwalten
+themes.table.headers.name=Name
+themes.table.headers.title=Titel
+themes.table.headers.version=Version
+themes.table.headers.type=Typ
+themes.table.headers.provider=Bereitgestellt durch
+themes.table.actions.republish=Republizieren
+themes.table.actions.publish=Publizieren
+themes.table.actions.unpublish=Depublizieren
+themes.table.actions.delete=L\u00f6schen
+themes.versions.live=Live
+themes.versions.draft=Draft
+themes.table.headers.actions=Aktionen
+themes.dialog.description.title=Beschreibung Theme {0}
+themes.dialog.description.close=Schlie\u00dfen
+themes.table.description.show=Beschreibung des Themes {0} anzeigen 
+themes.create_new_theme=Neues Theme anlegen
+themes.dialog.new_theme.title=Neues Theme anlegen
+themes.dialog.new_theme.close=Abbrechen
+themes.dialog.new_theme.create=Neues Theme anlegen
+themes.dialog.new_theme.name.help=Eindeutiger Name des neuen Themes
+themes.dialog.new_theme.name.label=Name
+themes.dialog.new_theme.provider.help=Der Provider, \u00fcber den das Theme verwaltet wird.
+themes.dialog.new_theme.provider.label=Provider
+themes.table.actions.unpublish.cancel=Abbrechen
+themes.table.actions.unpublish.confirm=Theme depublizieren
+themes.table.actions.unpublish.title=Depublizieren des Themes best\u00e4tigen
+themes.table.actions.unpublish.message=Sind Sie sicher, dass Sie das Theme {0} depublizieren wollen?
+themes.table.actions.delete.cancel=Abbrechen
+themes.table.actions.delete.confirm=Theme l\u00f6schen
+themes.table.actions.delete.title=L\u00f6schen des Themes best\u00e4tigen
+themes.table.actions.delete.message=Sind Sie sicher, dass Sie das Theme {0} l\u00f6schen wollen?

From dbdc1977382490a58d44cda57e02c356b7988fe1 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 1 Dec 2020 20:43:09 +0100
Subject: [PATCH 80/93] Typo

---
 .../libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml b/ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml
index 94496f2da..83e258cd7 100644
--- a/ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml
+++ b/ccm-shortcuts/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/applications/shortcuts/shortcuts.xhtml
@@ -31,7 +31,7 @@
                                          buttonTextClass="text-right"
                                          dialogId="shortcuts-add-form">
                         <f:facet name="title">
-                            <h3>#{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut.dialog.title']}</h3>
+                            <h2>#{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut.dialog.title']}</h2>
                         </f:facet>
                         <f:facet name="body">
                             <bootstrap:formGroupText help="#{ShortcutAdminMessages['shortcuts.ui.admin.add_shortcut.dialog.urlkey.help']}"

From 5caacee0e8b697d031c0cd68d98e76510a795615 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 2 Dec 2020 20:06:04 +0100
Subject: [PATCH 81/93] Some initial work for im/export ui

---
 ccm-core/pom.xml                              |  2 +-
 .../org/libreccm/imexport/ImportExport.java   | 22 ++++++----
 .../ui/admin/imexport/ImExportController.java | 26 +++++++++++-
 .../libreccm/ui/admin/imexport/export.xhtml   | 40 +++++++++++++++++++
 .../ui/admin/{ => imexport}/imexport.xhtml    |  0
 5 files changed, 81 insertions(+), 9 deletions(-)
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml
 rename ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/{ => imexport}/imexport.xhtml (100%)

diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 76d8f3c02..49f1dedf2 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -165,7 +165,7 @@
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk16</artifactId>
         </dependency>
-
+      
         <dependency>
             <groupId>net.sf.jtidy</groupId>
             <artifactId>jtidy</artifactId>
diff --git a/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java b/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
index 4a57a6593..1975136cc 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
@@ -89,9 +89,9 @@ public class ImportExport {
      *
      * @see CcmFilesConfiguration#dataPath
      */
-    public void exportEntities(final List<Exportable> entities,
-                               final String exportName) {
-
+    public void exportEntities(
+        final List<Exportable> entities, final String exportName
+    ) {
         final JsonObjectBuilder manifestBuilder = Json.createObjectBuilder();
         manifestBuilder.add("created",
                             LocalDateTime.now(ZoneId.of("UTC")).toString());
@@ -151,6 +151,14 @@ public class ImportExport {
                                    entry.getValue());
         }
     }
+    
+    public List<String> getExportableEntityTypes() {
+       return imExporters
+           .stream()
+           .map(imexporter -> imexporter.getEntityClass().getName())
+           .sorted()
+           .collect(Collectors.toList());
+    }
 
     @SuppressWarnings("unchecked")
     private JsonArrayBuilder createExportedEntities(
@@ -254,12 +262,12 @@ public class ImportExport {
         }
 
         final List<AbstractEntityImExporter<?>> imExportersList
-                                                    = new ArrayList<>();
+            = new ArrayList<>();
         imExporters.forEach(imExporter -> imExportersList.add(imExporter));
 
         try {
             final EntityImExporterTreeManager treeManager
-                                                  = new EntityImExporterTreeManager();
+                = new EntityImExporterTreeManager();
             final List<EntityImExporterTreeNode> tree = treeManager
                 .generateTree(imExportersList);
             final List<EntityImExporterTreeNode> orderedNodes = treeManager
@@ -332,7 +340,7 @@ public class ImportExport {
                                               type,
                                               fileName);
         try (final InputStream inputStream
-                                   = ccmFiles.createInputStream(filePath)) {
+            = ccmFiles.createInputStream(filePath)) {
 
             final String data = new BufferedReader(
                 new InputStreamReader(inputStream, StandardCharsets.UTF_8))
@@ -429,7 +437,7 @@ public class ImportExport {
 //                .collect(Collectors.toList());
             final JsonArray typesArray = manifestJson.getJsonArray("types");
             final List<String> types = new ArrayList<>();
-            for(int i = 0; i < typesArray.size(); i++) {
+            for (int i = 0; i < typesArray.size(); i++) {
                 types.add(typesArray.getString(i));
             }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
index a89b01927..51e40a6dc 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
@@ -18,12 +18,17 @@
  */
 package org.libreccm.ui.admin.imexport;
 
+import com.arsdigita.ui.admin.importexport.ImportExportMonitor;
+
 import org.libreccm.core.CoreConstants;
+import org.libreccm.imexport.ImportExport;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.mvc.Controller;
+import javax.mvc.Models;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
@@ -35,12 +40,31 @@ import javax.ws.rs.Path;
 @Controller
 @Path("/imexport")
 public class ImExportController {
+
+    @Inject
+    private ImportExport importExport;
+
+    @Inject
+    private ImportExportMonitor importExportMonitor;
     
+    @Inject
+    private Models models;
+
     @GET
     @Path("/")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String getImExportDashboard() {
-        return "org/libreccm/ui/admin/imexport.xhtml";
+        return "org/libreccm/ui/admin/imexport/imexport.xhtml";
+    }
+
+    @GET
+    @Path("/export")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String exportEntities() {
+        models.put("exportables", importExport.getExportableEntityTypes());
+        
+        return "org/libreccm/ui/admin/imexport/export.xhtml";
     }
 }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml
new file mode 100644
index 000000000..e02320160
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      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/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="imexport" />
+        <ui:param name="title" value="#{AdminMessages['imexport.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('ImExportController#getImExportDashboard')}">
+                    #{AdminMessages['imexport.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item active">
+                #{AdminMessages['imexport.export.label']}
+            </li>
+
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['imexport.export.label']}</h1>
+
+                <p>Exportable classes</p>
+                <ul>
+                    <c:forEach items="#{exportables}" var="exportable">
+                        <li><code>${exportable}</code></li>
+                    </c:forEach>
+                </ul>
+
+                <p>Placeholder</p>
+            </div>
+        </ui:define>
+
+    </ui:composition>
+</html>
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
similarity index 100%
rename from ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport.xhtml
rename to ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml

From bd0ccd0ae6256e1c7dbba6130ee3dd2045b68a78 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 3 Dec 2020 20:26:50 +0100
Subject: [PATCH 82/93] Im/Exporter for ContentSections

---
 .../ContentSectionImExporter.java             | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java

diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
new file mode 100644
index 000000000..78135dee8
--- /dev/null
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
@@ -0,0 +1,47 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.librecms.contentsection;
+
+import org.libreccm.imexport.AbstractEntityImExporter;
+import org.libreccm.imexport.Exportable;
+import org.libreccm.imexport.Processes;
+
+import java.util.Collections;
+import java.util.Set;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Processes(ContentSection.class)
+public class ContentSectionImExporter
+    extends AbstractEntityImExporter<ContentSection> {
+
+    @Inject
+    private ContentSectionRepository sectionRepository;
+
+    @Override
+    protected Class<ContentSection> getEntityClass() {
+        return ContentSection.class;
+    }
+
+    @Override
+    protected Set<Class<? extends Exportable>> getRequiredEntities() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    @Transactional(Transactional.TxType.REQUIRED)
+    protected void saveImportedEntity(final ContentSection entity) {
+        sectionRepository.save(entity);
+    }
+
+}

From c363b8cd439e3d62c706eec909ba76d4cc5bb01e Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 3 Dec 2020 20:27:16 +0100
Subject: [PATCH 83/93] Some bugfixes

---
 .../imexport/EntityImExporterTreeManager.java |  6 +-
 .../imexport/EntityImExporterTreeNode.java    | 93 ++++++++++++-------
 2 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeManager.java b/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeManager.java
index 52686e3f1..d5925e6d0 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeManager.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeManager.java
@@ -254,16 +254,12 @@ final class EntityImExporterTreeManager {
 
         //Check if the nodes list has an entry for the required module.
         if (!nodes.containsKey(requiredClass.getName())) {
-
             LOGGER.fatal("Required EntityImExporter for \"{}\" no found.",
                          requiredClass.getName());
             throw new DependencyException(String.format(
                 "EntityImExporter for type \"%s\" depends on type \"%s\" "
                     + "but no EntityImExporter for type \"%s\" is available.",
-                node
-                    .getEntityImExporter()
-                    .getClass()
-                    .getAnnotation(Processes.class).value().getName(),
+                node.getEntityImExporter().getEntityClass(),
                 requiredClass.getName(),
                 requiredClass.getName()));
         }
diff --git a/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java b/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
index 012c57ad2..57055530f 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
@@ -22,92 +22,94 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * A node in the dependency tree managed by {@link EntityImExporterTreeManager}.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 final class EntityImExporterTreeNode {
-    
+
     private AbstractEntityImExporter<?> entityImExporter;
-    
+
     private List<EntityImExporterTreeNode> dependentImExporters;
-    
+
     private List<EntityImExporterTreeNode> dependsOn;
-    
+
     public EntityImExporterTreeNode() {
-        
+
         super();
-        
+
         dependentImExporters = new ArrayList<>();
         dependsOn = new ArrayList<>();
     }
-    
+
     public EntityImExporterTreeNode(
         final AbstractEntityImExporter<?> entityImExporter) {
-        
+
         this();
         this.entityImExporter = entityImExporter;
     }
-    
+
     public AbstractEntityImExporter<?> getEntityImExporter() {
-        
+
         return entityImExporter;
     }
-    
+
     void setEntityImExporter(
         final AbstractEntityImExporter<?> entityImExporter) {
-        
+
         this.entityImExporter = entityImExporter;
     }
-    
+
     public List<EntityImExporterTreeNode> getDependentImExporters() {
         return Collections.unmodifiableList(dependentImExporters);
     }
-    
+
     void setDependentImExporters(
         final List<EntityImExporterTreeNode> dependentImExporters) {
-        
+
         this.dependentImExporters = new ArrayList<>(dependentImExporters);
     }
-    
+
     void addDependentImExporter(final EntityImExporterTreeNode node) {
-        
+
         dependentImExporters.add(node);
     }
-    
+
     void removeDependentImExporter(final EntityImExporterTreeNode node) {
-        
+
         dependentImExporters.remove(node);
     }
-    
+
     public List<EntityImExporterTreeNode> getDependsOn() {
-        
+
         return Collections.unmodifiableList(dependsOn);
     }
-    
+
     void setDependsOn(final List<EntityImExporterTreeNode> dependsOn) {
-        
+
         this.dependsOn = new ArrayList<>(dependsOn);
     }
-    
+
     void addDependsOn(final EntityImExporterTreeNode node) {
-        
+
         dependsOn.add(node);
     }
-    
+
     void removeDependsOn(final EntityImExporterTreeNode node) {
-        
+
         dependsOn.remove(node);
     }
 
     @Override
     public int hashCode() {
         int hash = 7;
-        hash = 47 
-               * hash 
-               + Objects.hashCode(this.entityImExporter.getClass().getName());
+        hash = 47
+                   * hash
+                   + Objects
+                .hashCode(this.entityImExporter.getClass().getName());
         return hash;
     }
 
@@ -127,7 +129,30 @@ final class EntityImExporterTreeNode {
             this.entityImExporter.getClass().getName(),
             other.getEntityImExporter().getClass().getName());
     }
-    
-    
-    
+
+    @Override
+    public String toString() {
+        return String.format(
+            "%s{ "
+                + "entityImExporter: %s, "
+                + "dependentImExporters: [%s], "
+                + "dependsOn: [%s]"
+                + " }",
+            super.toString(),
+            entityImExporter.getEntityClass().toString(),
+            dependentImExporters
+                .stream()
+                .map(EntityImExporterTreeNode::getEntityImExporter)
+                .map(AbstractEntityImExporter::getEntityClass)
+                .map(Class::getName)
+                .collect(Collectors.joining(", ")),
+            dependsOn
+                .stream()
+                .map(EntityImExporterTreeNode::getEntityImExporter)
+                .map(AbstractEntityImExporter::getEntityClass)
+                .map(Class::getName)
+                .collect(Collectors.joining(", "))
+        );
+    }
+
 }

From 1887deda677a3c09b41300e534eb4445f4806939 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 3 Dec 2020 20:29:06 +0100
Subject: [PATCH 84/93] Code formatting

---
 .../java/org/libreccm/categorization/CategoryImExporter.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java
index bf1278104..ad1b05a21 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java
@@ -43,13 +43,11 @@ public class CategoryImExporter extends AbstractEntityImExporter<Category> {
 
     @Override
     protected Class<Category> getEntityClass() {
-
         return Category.class;
     }
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-
         final Set<Class<? extends Exportable>> entities = new HashSet<>();
         entities.add(Domain.class);
 
@@ -59,7 +57,6 @@ public class CategoryImExporter extends AbstractEntityImExporter<Category> {
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final Category entity) {
-
         categoryRepository.save(entity);
     }
 

From 2489599372174327cef10ca86d823d45607ea854 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 3 Dec 2020 20:30:48 +0100
Subject: [PATCH 85/93] EntityImExporterTreeNode.java is now public

---
 .../java/org/libreccm/imexport/EntityImExporterTreeNode.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java b/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
index 57055530f..c93e119b1 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-final class EntityImExporterTreeNode {
+public final class EntityImExporterTreeNode {
 
     private AbstractEntityImExporter<?> entityImExporter;
 
@@ -38,7 +38,6 @@ final class EntityImExporterTreeNode {
     private List<EntityImExporterTreeNode> dependsOn;
 
     public EntityImExporterTreeNode() {
-
         super();
 
         dependentImExporters = new ArrayList<>();

From 20ba08580aa13c338c55ab86ff4f0dcf44c37a5a Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 3 Dec 2020 20:31:26 +0100
Subject: [PATCH 86/93] Constructor of EntityImExporterTreeNode is now
 protected

---
 .../java/org/libreccm/imexport/EntityImExporterTreeNode.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java b/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
index c93e119b1..60ec32f2f 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
@@ -37,7 +37,7 @@ public final class EntityImExporterTreeNode {
 
     private List<EntityImExporterTreeNode> dependsOn;
 
-    public EntityImExporterTreeNode() {
+    protected EntityImExporterTreeNode() {
         super();
 
         dependentImExporters = new ArrayList<>();

From f9a129cd398afd3676fa5c8176a7367c92e3fab7 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 3 Dec 2020 21:10:14 +0100
Subject: [PATCH 87/93] Bugfix

---
 .../ContentSectionImExporter.java             |   2 +-
 .../contenttypes/ArticleImExporter.java       |   2 +-
 .../contenttypes/EventImExporter.java         |   2 +-
 .../MultiPartArticleImExporter.java           |   2 +-
 .../librecms/contenttypes/NewsImExporter.java |   2 +-
 .../CategorizationImExporter.java             |   3 +-
 .../categorization/CategoryImExporter.java    |   2 +-
 .../categorization/DomainImExporter.java      |   2 +-
 .../DomainOwnershipImExporter.java            |   2 +-
 .../libreccm/core/ResourceTypeImExporter.java |   3 +-
 .../imexport/AbstractEntityImExporter.java    |   2 +-
 .../org/libreccm/imexport/ImportExport.java   | 172 +++++++++---------
 .../libreccm/security/GroupImExporter.java    |   2 +-
 .../security/GroupMembershipImExporter.java   |   3 +-
 .../security/PermissionImExporter.java        |   2 +-
 .../org/libreccm/security/RoleImExporter.java |   3 +-
 .../security/RoleMembershipImExporter.java    |   3 +-
 .../org/libreccm/security/UserImExporter.java |   2 +-
 .../workflow/AssignableTaskImExporter.java    |   2 +-
 .../workflow/TaskAssignmentImExporter.java    |   2 +-
 .../workflow/TaskCommentImExporter.java       |   2 +-
 .../workflow/TaskDependencyImExporter.java    |   2 +-
 .../libreccm/workflow/WorkflowImExporter.java |   2 +-
 23 files changed, 109 insertions(+), 112 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
index 78135dee8..a2cf7ecd0 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
@@ -29,7 +29,7 @@ public class ContentSectionImExporter
     private ContentSectionRepository sectionRepository;
 
     @Override
-    protected Class<ContentSection> getEntityClass() {
+    public Class<ContentSection> getEntityClass() {
         return ContentSection.class;
     }
 
diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/ArticleImExporter.java b/ccm-cms/src/main/java/org/librecms/contenttypes/ArticleImExporter.java
index d5110ffed..e2bbcce54 100644
--- a/ccm-cms/src/main/java/org/librecms/contenttypes/ArticleImExporter.java
+++ b/ccm-cms/src/main/java/org/librecms/contenttypes/ArticleImExporter.java
@@ -19,7 +19,7 @@ import javax.enterprise.context.RequestScoped;
 public class ArticleImExporter extends AbstractContentItemImExporter<Article> {
 
     @Override
-    protected Class<Article> getEntityClass() {
+    public Class<Article> getEntityClass() {
         return Article.class;
     }
 
diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/EventImExporter.java b/ccm-cms/src/main/java/org/librecms/contenttypes/EventImExporter.java
index da919aa54..782d2d049 100644
--- a/ccm-cms/src/main/java/org/librecms/contenttypes/EventImExporter.java
+++ b/ccm-cms/src/main/java/org/librecms/contenttypes/EventImExporter.java
@@ -19,7 +19,7 @@ import javax.enterprise.context.RequestScoped;
 public class EventImExporter extends AbstractContentItemImExporter<Event> {
 
     @Override
-    protected Class<Event> getEntityClass() {
+    public Class<Event> getEntityClass() {
         return Event.class;
     }
 
diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleImExporter.java b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleImExporter.java
index 204b2e053..ca3349900 100644
--- a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleImExporter.java
+++ b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleImExporter.java
@@ -20,7 +20,7 @@ public class MultiPartArticleImExporter
     extends AbstractContentItemImExporter<MultiPartArticle> {
 
     @Override
-    protected Class<MultiPartArticle> getEntityClass() {
+    public Class<MultiPartArticle> getEntityClass() {
         return MultiPartArticle.class;
     }
     
diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/NewsImExporter.java b/ccm-cms/src/main/java/org/librecms/contenttypes/NewsImExporter.java
index 872082c64..42ee1d1b7 100644
--- a/ccm-cms/src/main/java/org/librecms/contenttypes/NewsImExporter.java
+++ b/ccm-cms/src/main/java/org/librecms/contenttypes/NewsImExporter.java
@@ -19,7 +19,7 @@ import javax.enterprise.context.RequestScoped;
 public class NewsImExporter extends AbstractContentItemImExporter<News> {
 
     @Override
-    protected Class<News> getEntityClass() {
+    public Class<News> getEntityClass() {
         return News.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategorizationImExporter.java b/ccm-core/src/main/java/org/libreccm/categorization/CategorizationImExporter.java
index ebb62da5b..45b6a74b1 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/CategorizationImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategorizationImExporter.java
@@ -48,8 +48,7 @@ public class CategorizationImExporter
     private Instance<CategorizationImExporterDependenciesProvider> dependenciesProviders;
 
     @Override
-    protected Class<Categorization> getEntityClass() {
-
+    public Class<Categorization> getEntityClass() {
         return Categorization.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java
index ad1b05a21..9012e6245 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java
@@ -42,7 +42,7 @@ public class CategoryImExporter extends AbstractEntityImExporter<Category> {
     private CategoryRepository categoryRepository;
 
     @Override
-    protected Class<Category> getEntityClass() {
+    public Class<Category> getEntityClass() {
         return Category.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java
index ef732de27..2dda0ebfc 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java
@@ -41,7 +41,7 @@ public class DomainImExporter extends AbstractEntityImExporter<Domain> {
     private DomainRepository domainRepository;
     
     @Override
-    protected Class<Domain> getEntityClass() {
+    public Class<Domain> getEntityClass() {
         
         return Domain.class;
     }
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnershipImExporter.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnershipImExporter.java
index 124cc643f..1fda262bb 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnershipImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnershipImExporter.java
@@ -46,7 +46,7 @@ public class DomainOwnershipImExporter
     private EntityManager entityManager;
 
     @Override
-    protected Class<DomainOwnership> getEntityClass() {
+    public Class<DomainOwnership> getEntityClass() {
 
         return DomainOwnership.class;
     }
diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeImExporter.java b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeImExporter.java
index db7767350..8262c43ed 100644
--- a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeImExporter.java
@@ -39,8 +39,7 @@ public class ResourceTypeImExporter
     private ResourceTypeRepository repository;
 
     @Override
-    protected Class<ResourceType> getEntityClass() {
-        
+    public Class<ResourceType> getEntityClass() {
         return ResourceType.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java b/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
index b3ecd72b0..249801fca 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
@@ -53,7 +53,7 @@ public abstract class AbstractEntityImExporter<T extends Exportable> {
      *
      * @return The Entity class which is handled by the implementation.
      */
-    protected abstract Class<T> getEntityClass();
+    public abstract Class<T> getEntityClass();
 
     /**
      * A set of entities which should be processed before this implementation is
diff --git a/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java b/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
index 1975136cc..e896ceb20 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
@@ -75,6 +75,23 @@ public class ImportExport {
     @Any
     private Instance<AbstractEntityImExporter<?>> imExporters;
 
+    public List<EntityImExporterTreeNode> getExportableEntityTypes() {
+        try {
+            final EntityImExporterTreeManager treeManager
+                = new EntityImExporterTreeManager();
+            final List<EntityImExporterTreeNode> tree = treeManager
+                .generateTree(
+                    imExporters
+                        .stream()
+                        .collect(Collectors.toList())
+                );
+            
+            return tree;
+        } catch (DependencyException ex) {
+            throw new UnexpectedErrorException(ex);
+        }
+    }
+
     /**
      * Exports the provided entities. The export will be written to a to the
      * {@code exports} directory in the CCM files directory. If {@code split} is
@@ -151,84 +168,6 @@ public class ImportExport {
                                    entry.getValue());
         }
     }
-    
-    public List<String> getExportableEntityTypes() {
-       return imExporters
-           .stream()
-           .map(imexporter -> imexporter.getEntityClass().getName())
-           .sorted()
-           .collect(Collectors.toList());
-    }
-
-    @SuppressWarnings("unchecked")
-    private JsonArrayBuilder createExportedEntities(
-        final String exportName,
-        final String type,
-        final List<Exportable> entities) {
-
-        final JsonArrayBuilder filesArrayBuilder = Json.createArrayBuilder();
-
-        final Class<? extends Exportable> clazz;
-        try {
-            clazz = (Class<? extends Exportable>) Class.forName(type);
-        } catch (ClassNotFoundException ex) {
-            throw new UnexpectedErrorException(ex);
-        }
-
-        final Instance<AbstractEntityImExporter<?>> instance = imExporters
-            .select(new ProcessesLiteral(clazz));
-
-        final AbstractEntityImExporter<?> imExporter;
-        if (instance.isUnsatisfied()) {
-            throw new UnexpectedErrorException(String.format(
-                "No EntityImExporter for entity type \"%s\" available.",
-                type));
-        } else if (instance.isAmbiguous()) {
-            throw new UnexpectedErrorException(String.format(
-                "Instance reference for EntityImExporter for entity "
-                    + "type \"%s\" is ambiguous.",
-                type));
-        } else {
-            imExporter = instance.get();
-        }
-
-        for (Exportable entity : entities) {
-
-            final String filename = String.format("%s.json", entity.getUuid());
-            final OutputStream outputStream;
-            try {
-                outputStream = ccmFiles.createOutputStream(String.format(
-                    "exports/%s/%s/%s",
-                    exportName,
-                    type,
-                    filename));
-                filesArrayBuilder.add(filename);
-            } catch (FileAccessException
-                     | InsufficientPermissionsException ex) {
-                throw new UnexpectedErrorException(ex);
-            }
-
-            final String exportedEntity;
-            try {
-                exportedEntity = imExporter.exportEntity(entity);
-            } catch (ExportException ex) {
-                throw new UnexpectedErrorException(ex);
-            }
-            try (final OutputStreamWriter writer = new OutputStreamWriter(
-                outputStream, StandardCharsets.UTF_8)) {
-
-                writer.write(exportedEntity);
-
-            } catch (IOException ex) {
-                throw new UnexpectedErrorException(ex);
-            }
-//            try (JsonWriter writer = Json.createWriter(outputStream)) {
-//                writer.writeObject(exportedEntity);
-//            }
-        }
-
-        return filesArrayBuilder;
-    }
 
     /**
      * Imports all entities from the files in the {@link imports} directory
@@ -261,15 +200,15 @@ public class ImportExport {
             throw new UnexpectedErrorException(ex);
         }
 
-        final List<AbstractEntityImExporter<?>> imExportersList
-            = new ArrayList<>();
-        imExporters.forEach(imExporter -> imExportersList.add(imExporter));
-
         try {
             final EntityImExporterTreeManager treeManager
                 = new EntityImExporterTreeManager();
             final List<EntityImExporterTreeNode> tree = treeManager
-                .generateTree(imExportersList);
+                .generateTree(
+                    imExporters
+                        .stream()
+                        .collect(Collectors.toList())
+                );
             final List<EntityImExporterTreeNode> orderedNodes = treeManager
                 .orderImExporters(tree);
 
@@ -347,8 +286,6 @@ public class ImportExport {
                 .lines()
                 .collect(Collectors.joining("\n"));
 
-//            final JsonReader reader = Json.createReader(inputStream);
-//            final JsonObject data = reader.readObject();
             imExporter.importEntity(data);
 
         } catch (IOException
@@ -380,6 +317,71 @@ public class ImportExport {
             .collect(Collectors.toList());
     }
 
+    @SuppressWarnings("unchecked")
+    private JsonArrayBuilder createExportedEntities(
+        final String exportName,
+        final String type,
+        final List<Exportable> entities) {
+
+        final Class<? extends Exportable> clazz;
+        try {
+            clazz = (Class<? extends Exportable>) Class.forName(type);
+        } catch (ClassNotFoundException ex) {
+            throw new UnexpectedErrorException(ex);
+        }
+
+        final Instance<AbstractEntityImExporter<?>> instance = imExporters
+            .select(new ProcessesLiteral(clazz));
+
+        final AbstractEntityImExporter<?> imExporter;
+        if (instance.isUnsatisfied()) {
+            throw new UnexpectedErrorException(String.format(
+                "No EntityImExporter for entity type \"%s\" available.",
+                type));
+        } else if (instance.isAmbiguous()) {
+            throw new UnexpectedErrorException(String.format(
+                "Instance reference for EntityImExporter for entity "
+                    + "type \"%s\" is ambiguous.",
+                type));
+        } else {
+            imExporter = instance.get();
+        }
+
+        final JsonArrayBuilder filesArrayBuilder = Json.createArrayBuilder();
+        for (Exportable entity : entities) {
+            final String filename = String.format("%s.json", entity.getUuid());
+            final OutputStream outputStream;
+            try {
+                outputStream = ccmFiles.createOutputStream(String.format(
+                    "exports/%s/%s/%s",
+                    exportName,
+                    type,
+                    filename));
+                filesArrayBuilder.add(filename);
+            } catch (FileAccessException
+                     | InsufficientPermissionsException ex) {
+                throw new UnexpectedErrorException(ex);
+            }
+
+            final String exportedEntity;
+            try {
+                exportedEntity = imExporter.exportEntity(entity);
+            } catch (ExportException ex) {
+                throw new UnexpectedErrorException(ex);
+            }
+            try (final OutputStreamWriter writer = new OutputStreamWriter(
+                outputStream, StandardCharsets.UTF_8)) {
+
+                writer.write(exportedEntity);
+
+            } catch (IOException ex) {
+                throw new UnexpectedErrorException(ex);
+            }
+        }
+
+        return filesArrayBuilder;
+    }
+
     private boolean isImportArchive(final String path) {
 
         final String manifestPath = String.format("imports/%s/ccm-export.json",
diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupImExporter.java b/ccm-core/src/main/java/org/libreccm/security/GroupImExporter.java
index 9d0253018..669c6bd45 100644
--- a/ccm-core/src/main/java/org/libreccm/security/GroupImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/GroupImExporter.java
@@ -46,7 +46,7 @@ public class GroupImExporter extends AbstractEntityImExporter<Group> {
     private GroupRepository groupRepository;
     
     @Override
-    protected Class<Group> getEntityClass() {
+    public Class<Group> getEntityClass() {
         return Group.class;
     }
     
diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipImExporter.java b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipImExporter.java
index 8f26d5c91..fdda99ce8 100644
--- a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipImExporter.java
@@ -43,8 +43,7 @@ public class GroupMembershipImExporter
     private EntityManager entityManager;
 
     @Override
-    protected Class<GroupMembership> getEntityClass() {
-
+    public Class<GroupMembership> getEntityClass() {
         return GroupMembership.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java b/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java
index 48275d0dc..f51633d09 100644
--- a/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java
@@ -41,7 +41,7 @@ public class PermissionImExporter extends AbstractEntityImExporter<Permission>{
     private PermissionRepository permissionRepository;
     
     @Override
-    protected Class<Permission> getEntityClass() {
+    public Class<Permission> getEntityClass() {
         return Permission.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java b/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java
index 05f6cdc45..f2a4d9bf2 100644
--- a/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java
@@ -39,8 +39,7 @@ public class RoleImExporter extends AbstractEntityImExporter<Role> {
     private RoleRepository roleRepository;
     
     @Override
-    protected Class<Role> getEntityClass() {
-        
+    public Class<Role> getEntityClass() {
         return Role.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleMembershipImExporter.java b/ccm-core/src/main/java/org/libreccm/security/RoleMembershipImExporter.java
index a397299ce..0c9d82f10 100644
--- a/ccm-core/src/main/java/org/libreccm/security/RoleMembershipImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/RoleMembershipImExporter.java
@@ -42,8 +42,7 @@ public class RoleMembershipImExporter
     private EntityManager entityManager;
 
     @Override
-    protected Class<RoleMembership> getEntityClass() {
-
+    public Class<RoleMembership> getEntityClass() {
         return RoleMembership.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/security/UserImExporter.java b/ccm-core/src/main/java/org/libreccm/security/UserImExporter.java
index bf34502ee..5f4e29943 100644
--- a/ccm-core/src/main/java/org/libreccm/security/UserImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/UserImExporter.java
@@ -46,7 +46,7 @@ public class UserImExporter extends AbstractEntityImExporter<User> {
     private UserRepository userRepository;
 
     @Override
-    protected Class<User> getEntityClass() {
+    public Class<User> getEntityClass() {
         return User.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskImExporter.java b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskImExporter.java
index 287b63237..13f346ae1 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskImExporter.java
@@ -45,7 +45,7 @@ public class AssignableTaskImExporter
     private AssignableTaskRepository assignableTaskRepository;
 
     @Override
-    protected Class<AssignableTask> getEntityClass() {
+    public Class<AssignableTask> getEntityClass() {
         return AssignableTask.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentImExporter.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentImExporter.java
index bb8fb2933..f4bb4c704 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentImExporter.java
@@ -45,7 +45,7 @@ public class TaskAssignmentImExporter
     private EntityManager entityManager;
 
     @Override
-    protected Class<TaskAssignment> getEntityClass() {
+    public Class<TaskAssignment> getEntityClass() {
 
         return TaskAssignment.class;
     }
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentImExporter.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentImExporter.java
index adec8de19..6ffe6a7c3 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentImExporter.java
@@ -43,7 +43,7 @@ public class TaskCommentImExporter extends AbstractEntityImExporter<TaskComment>
     private TaskCommentRepository taskCommentRepository;
 
     @Override
-    protected Class<TaskComment> getEntityClass() {
+    public Class<TaskComment> getEntityClass() {
         return TaskComment.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyImExporter.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyImExporter.java
index e66aac96b..15293c412 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyImExporter.java
@@ -45,7 +45,7 @@ public class TaskDependencyImExporter
     private EntityManager entityManager;
 
     @Override
-    protected Class<TaskDependency> getEntityClass() {
+    public Class<TaskDependency> getEntityClass() {
         return TaskDependency.class;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowImExporter.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowImExporter.java
index bb0c24c71..de9549a1d 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowImExporter.java
@@ -42,7 +42,7 @@ public class WorkflowImExporter extends AbstractEntityImExporter<Workflow> {
     private WorkflowRepository workflowRepository;
 
     @Override
-    protected Class<Workflow> getEntityClass() {
+    public Class<Workflow> getEntityClass() {
 
         return Workflow.class;
     }

From 39358f6c026e1627c0c53cb7ef66c9d918a9c2a9 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 3 Dec 2020 21:10:31 +0100
Subject: [PATCH 88/93] Form for configuring export

---
 .../ui/admin/imexport/ImExportController.java | 30 +++++++++--
 .../libreccm/web/ApplicationImExporter.java   |  3 +-
 .../libreccm/ui/admin/imexport/export.xhtml   | 34 +++++++++---
 .../libreccm/ui/admin/imexport/imexport.xhtml | 53 ++++++++++++++++++-
 .../org/libreccm/ui/admin/themes/themes.xhtml | 30 +++++------
 .../org/libreccm/ui/AdminBundle.properties    | 10 ++++
 .../org/libreccm/ui/AdminBundle_de.properties | 10 ++++
 7 files changed, 141 insertions(+), 29 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
index 51e40a6dc..ffdde63fa 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
@@ -21,15 +21,20 @@ package org.libreccm.ui.admin.imexport;
 import com.arsdigita.ui.admin.importexport.ImportExportMonitor;
 
 import org.libreccm.core.CoreConstants;
+import org.libreccm.imexport.AbstractEntityImExporter;
+import org.libreccm.imexport.EntityImExporterTreeNode;
 import org.libreccm.imexport.ImportExport;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
+import java.util.stream.Collectors;
+
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
 import javax.ws.rs.GET;
+import javax.ws.rs.NotFoundException;
 import javax.ws.rs.Path;
 
 /**
@@ -46,7 +51,7 @@ public class ImExportController {
 
     @Inject
     private ImportExportMonitor importExportMonitor;
-    
+
     @Inject
     private Models models;
 
@@ -63,8 +68,27 @@ public class ImExportController {
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String exportEntities() {
-        models.put("exportables", importExport.getExportableEntityTypes());
-        
+        models.put(
+            "exportableEntities",
+            importExport
+                .getExportableEntityTypes()
+                .stream()
+                .map(EntityImExporterTreeNode::getEntityImExporter)
+                .map(AbstractEntityImExporter::getEntityClass)
+                .map(Class::getName)
+                .sorted()
+                .collect(Collectors.toList())
+        );
+
         return "org/libreccm/ui/admin/imexport/export.xhtml";
     }
+    
+    @GET
+    @Path("/import")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String importEntities() {
+        throw new NotFoundException();
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationImExporter.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationImExporter.java
index a32fdf5b4..35038e547 100644
--- a/ccm-core/src/main/java/org/libreccm/web/ApplicationImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationImExporter.java
@@ -43,8 +43,7 @@ public class ApplicationImExporter
     private ApplicationRepository applicationRepository;
 
     @Override
-    protected Class<CcmApplication> getEntityClass() {
-
+    public Class<CcmApplication> getEntityClass() {
         return CcmApplication.class;
     }
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml
index e02320160..81b18b118 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml
@@ -1,7 +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:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
@@ -24,14 +26,32 @@
             <div class="container">
                 <h1>#{AdminMessages['imexport.export.label']}</h1>
 
-                <p>Exportable classes</p>
-                <ul>
-                    <c:forEach items="#{exportables}" var="exportable">
-                        <li><code>${exportable}</code></li>
-                    </c:forEach>
-                </ul>
+                <form action="#"
+                      aria-describedby="export-help">
+                    <p id="export-help">#{AdminMessages['imexport.export.help']}</p>
 
-                <p>Placeholder</p>
+                    <c:forEach items="#{exportableEntities}" var="entity">
+                        <bootstrap:formCheck
+                            inputId="#{entity.replace('.', '-')}"
+                            label="#{entity}"
+                            name="#{entity.replace('.', '-')}"
+                            value="#{entity}" />
+                    </c:forEach>
+
+                    <bootstrap:formGroupText 
+                        help="#{AdminMessages['imexport.export.export_name.help']}"
+                        inputId="exportName"
+                        label="#{AdminMessages['imexport.export.export_name.label']}"
+                        name="exportName" />
+
+                    <a class="btn btn-warning"
+                       href="#{mvc.uri('ImExportController#getImExportDashboard')}">
+                        #{AdminMessages['imexport.export.cancel']}
+                    </a>
+                    <button class="btn btn-success" type="submit">
+                        #{AdminMessages['imexport.export.submit']}
+                    </button>
+                </form>
             </div>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
index 0910af948..848ebcebe 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
@@ -2,7 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" 
       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:ui="http://xmlns.jcp.org/jsf/facelets"
+      xmlns:xlink="http://www.w3.org/1999/xlink">
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
 
         <ui:param name="activePage" value="imexport" />
@@ -17,7 +18,55 @@
         <ui:define name="main">
             <div class="container">
                 <h1>#{AdminMessages['imexport.label']}</h1>
-                <p>Placeholder</p>
+                <div class="row row-cols-1 row-cols-sm-1 row-cols-sm-2 row-cols-md-3 row-cols-lg-4 row-cols-xl-5">
+                    <div class="col mb-4">
+                        <div aria-describedby="import-card-body"
+                             class="card pt-2"
+                             id="import-card">
+                            <svg aria-hidden="true"
+                                 class="card-img-top"
+                                 fill="currentColor">
+                                <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#download" />
+                            </svg>
+                            <div class="card-body"
+                                 id="import-card-body">
+                                <h2 class="card-title">
+                                    <a class="stretched-link"
+                                       href="#{mvc.uri('ImExportController#importEntities')}">
+                                        #{AdminMessages['import.label']}
+                                    </a>
+                                </h2>
+                                <p class="card-text">
+                                    #{import.description}
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                    
+                    <div class="col mb-4">
+                        <div aria-describedby="export-card-body"
+                             class="card pt-2"
+                             id="export-card">
+                            <svg aria-hidden="true"
+                                 class="card-img-top"
+                                 fill="currentColor">
+                                <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#download" />
+                            </svg>
+                            <div class="card-body"
+                                 id="export-card-body">
+                                <h2 class="card-title">
+                                    <a class="stretched-link"
+                                       href="#{mvc.uri('ImExportController#exportEntities')}">
+                                        #{AdminMessages['export.label']}
+                                    </a>
+                                </h2>
+                                <p class="card-text">
+                                    #{export.description}
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/themes/themes.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/themes/themes.xhtml
index c14dd1ee0..8cd0203c7 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/themes/themes.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/themes/themes.xhtml
@@ -41,14 +41,14 @@
                         </bootstrap:formGroupSelect>
                     </f:facet>
                     <f:facet name="footer">
-                         <button class="btn btn-secondary" 
-                                    data-dismiss="modal"
-                                    type="button" >
-                                #{AdminMessages['themes.dialog.new_theme.close']}
-                            </button>
-                            <button type="submit" class="btn btn-primary">
-                                #{AdminMessages['themes.dialog.new_theme.create']}
-                            </button>
+                        <button class="btn btn-secondary" 
+                                data-dismiss="modal"
+                                type="button" >
+                            #{AdminMessages['themes.dialog.new_theme.close']}
+                        </button>
+                        <button type="submit" class="btn btn-primary">
+                            #{AdminMessages['themes.dialog.new_theme.create']}
+                        </button>
                     </f:facet>
                 </bootstrap:modalForm>
                 <table class="table table-hover">
@@ -81,7 +81,7 @@
                                         </button>
                                         <div aria-labelledby="theme-#{theme.name}-description-title"
                                              aria-hidden="true"
-                                            class="modal fade"
+                                             class="modal fade"
                                              id="theme-#{theme.name}-description"
                                              tabindex="-1">
                                             <div class="modal-dialog">
@@ -90,10 +90,10 @@
                                                          id="theme-#{theme.name}-description-title">
                                                         <h2>#{AdminMessages.getMessage('themes.dialog.description.title', [theme.name])}</h2>
                                                         <button aria-label="#{AdminMessages['themes.dialog.description.close']}"
-                                                            class="close"
+                                                                class="close"
                                                                 data-dismiss="modal"
                                                                 type="button">
-                                                                      <span aria-hidden="true">&times;</span>
+                                                            <span aria-hidden="true">&times;</span>
                                                         </button>
                                                     </div>
                                                     <div class="modal-body">
@@ -119,7 +119,7 @@
                                             <form action="#{mvc.uri('ThemesController#publishTheme', {'themeName': theme.name})}">
                                                 <button class="btn btn-primary"
                                                         type="button">
-                                                            #{AdminMessages['themes.table.actions.republish']}
+                                                    #{AdminMessages['themes.table.actions.republish']}
                                                 </button>
                                             </form>
                                         </c:when>
@@ -127,7 +127,7 @@
                                             <form action="#{mvc.uri('ThemesController#publishTheme', {'themeName': theme.name})}">
                                                 <button class="btn btn-primary"
                                                         type="button">
-                                                            #{AdminMessages['themes.table.actions.publish']}
+                                                    #{AdminMessages['themes.table.actions.publish']}
                                                 </button>
                                             </form>
                                         </c:when>
@@ -142,7 +142,7 @@
                                                                dialogId="theme-#{theme.name}-unpublish"
                                                                dialogTitle="#{AdminMessages['themes.table.actions.unpublish.title']}"
                                                                message="#{AdminMessages.getMessage('themes.table.actions.unpublish.message', [theme.name])}"
-                                            />
+                                                               />
                                     </c:if>
                                 </td>
                                 <td>
@@ -154,7 +154,7 @@
                                                                dialogId="theme-#{theme.name}-unpublish"
                                                                dialogTitle="#{AdminMessages['themes.table.actions.delete.title']}"
                                                                message="#{AdminMessages.getMessage('themes.table.actions.delete.message', [theme.name])}"
-                                            />
+                                                               />
                                     </c:if>
                                 </td>
                             </tr>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index ca1a32d5b..cd568dd92 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -526,3 +526,13 @@ themes.table.actions.delete.cancel=Cancel
 themes.table.actions.delete.confirm=Delete theme
 themes.table.actions.delete.title=Confirm theme deletion
 themes.table.actions.delete.message=Are you sure to delete the theme {0}?
+imexport.export.label=Export
+import.label=Import
+import.description=Import entities from import archives
+export.label=Export
+export.description=Export entities
+imexport.export.help=Export the following entities
+imexport.export.export_name.help=Name of the export archive
+imexport.export.export_name.label=to
+imexport.export.submit=Export
+imexport.export.cancel=Cancel
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index e82e6aa5c..6b488ba9d 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -526,3 +526,13 @@ themes.table.actions.delete.cancel=Abbrechen
 themes.table.actions.delete.confirm=Theme l\u00f6schen
 themes.table.actions.delete.title=L\u00f6schen des Themes best\u00e4tigen
 themes.table.actions.delete.message=Sind Sie sicher, dass Sie das Theme {0} l\u00f6schen wollen?
+imexport.export.label=Export
+import.label=Import
+import.description=Entities aus Import-Archiven importieren
+export.label=Export
+export.description=Entitities exportieren
+imexport.export.help=Export the following entities
+imexport.export.export_name.help=Name des Export Archives
+imexport.export.export_name.label=nach
+imexport.export.submit=Exportieren
+imexport.export.cancel=Abbrechen

From 210c0e08bb2bd5cf27796cac04749b73eed6e062 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sat, 5 Dec 2020 19:36:39 +0100
Subject: [PATCH 89/93] Aktueller Stand ImExport UI

---
 .../imexport/AbstractEntityImExporter.java    |   1 -
 .../imexport/EntityImExporterTreeNode.java    |   8 +-
 .../org/libreccm/imexport/ImportExport.java   |   8 +-
 .../org/libreccm/security/RoleImExporter.java |   3 +
 .../ui/admin/imexport/ImExportController.java |  95 ++++++++++-
 .../ui/admin/imexport/ImExportTask.java       | 139 ++++++++++++++++
 .../ui/admin/imexport/ImExportTasks.java      |  64 ++++++++
 .../imexport/ImportExportTaskManager.java     | 152 ++++++++++++++++++
 .../components/bootstrap/formCheck.xhtml      |   3 +-
 .../libreccm/ui/admin/imexport/export.xhtml   |  20 ++-
 .../ui/admin/imexport/exporting.xhtml         |  36 +++++
 .../libreccm/ui/admin/imexport/imexport.xhtml |  96 ++++++++++-
 .../org/libreccm/ui/AdminBundle.properties    |  20 +++
 .../org/libreccm/ui/AdminBundle_de.properties |  20 +++
 14 files changed, 644 insertions(+), 21 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTask.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/exporting.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java b/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
index 249801fca..e4bbeb207 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
@@ -85,7 +85,6 @@ public abstract class AbstractEntityImExporter<T extends Exportable> {
 
     @Transactional(Transactional.TxType.REQUIRED)
     public String exportEntity(final Exportable entity) throws ExportException {
-
         try {
             return objectMapper.writeValueAsString(entity);
         } catch (JsonProcessingException ex) {
diff --git a/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java b/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
index 60ec32f2f..1173dc42f 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/EntityImExporterTreeNode.java
@@ -105,10 +105,10 @@ public final class EntityImExporterTreeNode {
     @Override
     public int hashCode() {
         int hash = 7;
-        hash = 47
-                   * hash
-                   + Objects
-                .hashCode(this.entityImExporter.getClass().getName());
+        hash = 47 * hash
+                   + Objects.hashCode(
+                this.entityImExporter.getClass().getName()
+            );
         return hash;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java b/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
index e896ceb20..1402b6a22 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
@@ -38,6 +38,7 @@ import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -59,6 +60,7 @@ import javax.json.JsonObjectBuilder;
 import javax.json.JsonReader;
 import javax.json.JsonString;
 import javax.json.JsonWriter;
+import javax.transaction.Transactional;
 
 /**
  * Central service for importing and exporting entities.
@@ -106,8 +108,9 @@ public class ImportExport {
      *
      * @see CcmFilesConfiguration#dataPath
      */
+    @Transactional(Transactional.TxType.REQUIRED)
     public void exportEntities(
-        final List<Exportable> entities, final String exportName
+        final Collection<Exportable> entities, final String exportName
     ) {
         final JsonObjectBuilder manifestBuilder = Json.createObjectBuilder();
         manifestBuilder.add("created",
@@ -162,7 +165,6 @@ public class ImportExport {
 
         for (final Map.Entry<String, List<Exportable>> entry
                  : typeEntityMap.entrySet()) {
-
             createExportedEntities(exportName,
                                    entry.getKey(),
                                    entry.getValue());
@@ -182,8 +184,8 @@ public class ImportExport {
      *
      * @see CcmFilesConfiguration#dataPath
      */
+    @Transactional(Transactional.TxType.REQUIRED)
     public void importEntities(final String importName) {
-
         final String importsPath = String.format("imports/%s", importName);
 
         try {
diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java b/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java
index f2a4d9bf2..2f2656163 100644
--- a/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java
@@ -19,6 +19,7 @@
 package org.libreccm.security;
 
 import org.libreccm.imexport.AbstractEntityImExporter;
+import org.libreccm.imexport.ExportException;
 import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
@@ -55,4 +56,6 @@ public class RoleImExporter extends AbstractEntityImExporter<Role> {
         return Collections.emptySet();
     }
     
+    
+    
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
index ffdde63fa..faecb9f50 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
@@ -18,23 +18,28 @@
  */
 package org.libreccm.ui.admin.imexport;
 
-import com.arsdigita.ui.admin.importexport.ImportExportMonitor;
-
 import org.libreccm.core.CoreConstants;
 import org.libreccm.imexport.AbstractEntityImExporter;
 import org.libreccm.imexport.EntityImExporterTreeNode;
+import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.ImportExport;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
 import javax.mvc.Models;
+import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.NotFoundException;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 
 /**
@@ -50,7 +55,7 @@ public class ImExportController {
     private ImportExport importExport;
 
     @Inject
-    private ImportExportMonitor importExportMonitor;
+    private ImportExportTaskManager taskManager;
 
     @Inject
     private Models models;
@@ -77,12 +82,65 @@ public class ImExportController {
                 .map(AbstractEntityImExporter::getEntityClass)
                 .map(Class::getName)
                 .sorted()
-                .collect(Collectors.toList())
+                .collect(
+                    Collectors.toMap(
+                        clazz -> clazz,
+                        clazz -> clazz,
+                        this::noDuplicateKeys,
+                        TreeMap::new
+                    )
+                )
+        //.collect(Collectors.toList())
         );
 
         return "org/libreccm/ui/admin/imexport/export.xhtml";
     }
-    
+
+    @POST
+    @Path("/export")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String exportEntities(
+        @FormParam("selectedEntities") final String[] selectedEntitiesParam,
+        @FormParam("exportName") final String exportName
+    ) {
+        final Set<String> selectedEntities = Arrays
+            .stream(selectedEntitiesParam)
+            .collect(Collectors.toSet());
+
+        final Set<EntityImExporterTreeNode> selectedNodes = importExport
+            .getExportableEntityTypes()
+            .stream()
+            .filter(
+                node -> selectedEntities.contains(
+                    node.getEntityImExporter().getEntityClass().getName()
+                )
+            )
+            .collect(Collectors.toSet());
+
+        final Set<EntityImExporterTreeNode> exportNodes = addRequiredEntities(
+            new HashSet<>(selectedNodes)
+        );
+
+        final Set<Class<? extends Exportable>> exportTypes = exportNodes
+            .stream()
+            .map(node -> node.getEntityImExporter().getEntityClass())
+            .collect(Collectors.toSet());
+
+        taskManager.exportEntities(exportTypes, exportName);
+
+//        models.put(
+//            "exportEntities",
+//            exportNodes
+//                .stream()
+//                .map(node -> node.getEntityImExporter().getEntityClass().getName())
+//                .sorted()
+//                .collect(Collectors.joining("\n"))
+//        );
+//        return "org/libreccm/ui/admin/imexport/exporting.xhtml";
+        return "redirect:imexport";
+    }
+
     @GET
     @Path("/import")
     @AuthorizationRequired
@@ -91,4 +149,31 @@ public class ImExportController {
         throw new NotFoundException();
     }
 
+    private String noDuplicateKeys(final String str1, final String str2) {
+        throw new RuntimeException("No duplicate keys allowed.");
+    }
+
+    private Set<EntityImExporterTreeNode> addRequiredEntities(
+        final Set<EntityImExporterTreeNode> selectedNodes
+    ) {
+        boolean foundRequiredNodes = false;
+        final Set<EntityImExporterTreeNode> exportNodes = new HashSet<>(
+            selectedNodes
+        );
+        for (final EntityImExporterTreeNode node : selectedNodes) {
+            if (node.getDependsOn() != null
+                    && !node.getDependsOn().isEmpty()
+                    && !exportNodes.containsAll(node.getDependsOn())) {
+                exportNodes.addAll(node.getDependsOn());
+                foundRequiredNodes = true;
+            }
+        }
+
+        if (foundRequiredNodes) {
+            return addRequiredEntities(exportNodes);
+        } else {
+            return exportNodes;
+        }
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTask.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTask.java
new file mode 100644
index 000000000..da1688804
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTask.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.imexport;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.concurrent.Future;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class ImExportTask implements Comparable<ImExportTask> {
+
+    private String name;
+
+    private LocalDateTime started;
+
+    private Future<?> status;
+
+    public String getName() {
+        return name;
+    }
+
+    protected void setName(final String name) {
+        this.name = name;
+    }
+
+    public LocalDateTime getStarted() {
+        return started;
+    }
+
+    public String getStartedAsIso() {
+        return DateTimeFormatter.ISO_DATE_TIME.withZone(
+            ZoneId.systemDefault()).format(started
+        );
+    }
+
+    protected void setStarted(final LocalDateTime started) {
+        this.started = started;
+    }
+
+    public Future<?> getStatus() {
+        return status;
+    }
+
+    protected void setStatus(final Future<?> status) {
+        this.status = status;
+    }
+
+    public boolean isDone() {
+        return status.isDone();
+    }
+
+    protected void cancel() {
+        status.cancel(true);
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 23 * hash + Objects.hashCode(this.name);
+        hash = 23 * hash + Objects.hashCode(this.started);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof ImExportTask)) {
+            return false;
+        }
+        final ImExportTask other = (ImExportTask) obj;
+        if (!other.canEqual(this)) {
+            return false;
+        }
+        if (!Objects.equals(this.name, other.getName())) {
+            return false;
+        }
+        return Objects.equals(this.started, other.getStarted());
+    }
+
+    public boolean canEqual(final Object obj) {
+        return obj instanceof ImExportTask;
+    }
+
+    @Override
+    public int compareTo(final ImExportTask other) {
+        return Comparator
+            .nullsFirst(Comparator
+                .comparing(ImExportTask::getName)
+                .thenComparing(ImExportTask::getStarted)
+            )
+            .compare(this, other);
+    }
+
+    @Override
+    public String toString() {
+        return String.format(
+            "%s{ "
+                + "name = %s, "
+                + "started = %s, "
+                + "status = %s"
+                + " }",
+            super.toString(),
+            name,
+            DateTimeFormatter.ISO_DATE_TIME.withZone(
+                ZoneId.systemDefault()
+            ).format(started),
+            Objects.toString(status)
+        );
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
new file mode 100644
index 000000000..4e425ac38
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.imexport;
+
+import org.libreccm.imexport.Exportable;
+import org.libreccm.imexport.ImportExport;
+
+import java.util.Collection;
+import java.util.concurrent.Future;
+
+import javax.ejb.AsyncResult;
+import javax.ejb.Asynchronous;
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@Stateless
+public class ImExportTasks {
+
+    @Inject
+    private ImportExport importExport;
+
+    @Asynchronous
+    @Transactional(Transactional.TxType.REQUIRES_NEW)
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public Future<?> startExport(
+        final Collection<Exportable> entities,
+        final String exportName
+    ) {
+        importExport.exportEntities(entities, exportName);
+        return new AsyncResult<>(null);
+    }
+
+    @Asynchronous
+    @Transactional(Transactional.TxType.REQUIRES_NEW)
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public Future<?> startImport(final String importName) {
+        importExport.importEntities(importName);
+        return new AsyncResult<>(null);
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
new file mode 100644
index 000000000..546ed1c71
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.imexport;
+
+import org.libreccm.imexport.Exportable;
+import org.libreccm.imexport.ImportExport;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.concurrent.Future;
+
+import javax.ejb.AsyncResult;
+import javax.ejb.Asynchronous;
+import javax.ejb.Schedule;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.persistence.EntityManager;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import javax.transaction.Transactional;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@ApplicationScoped
+@Named("ImportExportTaskManager")
+public class ImportExportTaskManager {
+
+    @Inject
+    private EntityManager entityManager;
+
+    @Inject
+    private ImExportTasks imExportTasks;
+
+    private SortedSet<ImExportTask> exportTasks;
+
+    private SortedSet<ImExportTask> importTasks;
+
+    public ImportExportTaskManager() {
+        exportTasks = new TreeSet<>(
+            Comparator.comparing(
+                ImExportTask::getStarted)
+                .thenComparing(ImExportTask::getName)
+        );
+        importTasks = new TreeSet<>(
+            Comparator.comparing(
+                ImExportTask::getStarted)
+                .thenComparing(ImExportTask::getName)
+        );
+    }
+
+    public SortedSet<ImExportTask> getExportTasks() {
+        return Collections.unmodifiableSortedSet(exportTasks);
+    }
+
+    public SortedSet<ImExportTask> getImportTasks() {
+        return Collections.unmodifiableSortedSet(importTasks);
+    }
+
+    @Transactional(Transactional.TxType.REQUIRED)
+    public void exportEntities(
+        final Set<Class<? extends Exportable>> exportTypes,
+        final String exportName
+    ) {
+        final Set<Exportable> entities = new HashSet<>();
+        for (final Class<? extends Exportable> type : exportTypes) {
+            @SuppressWarnings("unchecked")
+            final Set<? extends Exportable> entitiesOfType = collectEntities(
+                (Class<Exportable>) type
+            );
+            entities.addAll(entitiesOfType);
+        }
+
+        final ImExportTask task = new ImExportTask();
+        task.setName(exportName);
+        task.setStarted(LocalDateTime.now());
+        final Future<?> status = imExportTasks.startExport(
+            entities, exportName
+        );
+        task.setStatus(status);
+        exportTasks.add(task);
+    }
+
+//    public void exportEntities(
+//        final Collection<Exportable> entities, final String exportName
+//    ) {
+//        final ImExportTask task = new ImExportTask();
+//        task.setName(exportName);
+//        task.setStarted(LocalDate.now());
+//        final Future<?> status = startExport(entities, exportName);
+//        task.setStatus(status);
+//        exportTasks.add(task);
+//    }
+    public void importEntities(final String importName) {
+        final ImExportTask task = new ImExportTask();
+        task.setName(importName);
+        task.setStarted(LocalDateTime.now());
+        final Future<?> status = imExportTasks.startImport(importName);
+        task.setStatus(status);
+        importTasks.add(task);
+    }
+
+    @Schedule(hour = "*", minute = "*/5", persistent = false)
+    protected void removeFinishedTasks() {
+        exportTasks.removeIf(ImExportTask::isDone);
+        importTasks.removeIf(ImExportTask::isDone);
+    }
+
+    public void cancelTask(final ImExportTask task) {
+        task.cancel();
+    }
+
+    private Set<? extends Exportable> collectEntities(
+        final Class<Exportable> ofType
+    ) {
+        final CriteriaBuilder builder = entityManager.getCriteriaBuilder();
+        final CriteriaQuery<Exportable> query = builder.createQuery(ofType);
+        final Root<Exportable> from = query.from(ofType);
+
+        return new HashSet<>(
+            entityManager.createQuery(
+                query.select(from)
+            ).getResultList()
+        );
+    }
+
+}
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml
index 7e4dd479e..5c1d349b3 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formCheck.xhtml
@@ -36,7 +36,8 @@
                 class="form-check-input" 
                    id="#{cc.attrs.inputId}"
                    name="#{cc.attrs.name}"
-                   type="checkbox" />
+                   type="checkbox"
+                   value="#{value}" />
             <label for="#{cc.attrs.inputId}">#{cc.attrs.label}</label>
         </div>
     </cc:implementation>
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml
index 81b18b118..d10a2a48f 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/export.xhtml
@@ -26,23 +26,31 @@
             <div class="container">
                 <h1>#{AdminMessages['imexport.export.label']}</h1>
 
-                <form action="#"
-                      aria-describedby="export-help">
+                <form action="#{mvc.uri('ImExportController#exportEntities')}"
+                      aria-describedby="export-help"
+                      method="post">
                     <p id="export-help">#{AdminMessages['imexport.export.help']}</p>
 
-                    <c:forEach items="#{exportableEntities}" var="entity">
+<!--                    <c:forEach items="#{exportableEntities}" var="entity">
                         <bootstrap:formCheck
                             inputId="#{entity.replace('.', '-')}"
                             label="#{entity}"
-                            name="#{entity.replace('.', '-')}"
+                            name="selectedEntities"
                             value="#{entity}" />
-                    </c:forEach>
+                    </c:forEach>-->
+                    
+                    <bootstrap:formGroupChecks options="#{exportableEntities}"
+                                               help="#{AdminMessages['imexport.export.exportentities.help']}"
+                                               inputId="exportentity"
+                                               label="#{AdminMessages['imexport.export.exportentities.label']}"
+                                               name="selectedEntities" />
 
                     <bootstrap:formGroupText 
                         help="#{AdminMessages['imexport.export.export_name.help']}"
                         inputId="exportName"
                         label="#{AdminMessages['imexport.export.export_name.label']}"
-                        name="exportName" />
+                        name="exportName"
+                        required="treu" />
 
                     <a class="btn btn-warning"
                        href="#{mvc.uri('ImExportController#getImExportDashboard')}">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/exporting.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/exporting.xhtml
new file mode 100644
index 000000000..2b5bdc8ee
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/exporting.xhtml
@@ -0,0 +1,36 @@
+<!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:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="imexport" />
+        <ui:param name="title" value="#{AdminMessages['imexport.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('ImExportController#getImExportDashboard')}">
+                    #{AdminMessages['imexport.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item active">
+                #{AdminMessages['imexport.export.label']}
+            </li>
+
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['imexport.export.label']}</h1>
+
+                <pre>#{exportEntities}</pre>
+            </div>
+        </ui:define>
+
+    </ui:composition>
+</html>
+
+
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
index 848ebcebe..9f524b6e9 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
@@ -42,7 +42,7 @@
                             </div>
                         </div>
                     </div>
-                    
+
                     <div class="col mb-4">
                         <div aria-describedby="export-card-body"
                              class="card pt-2"
@@ -67,6 +67,100 @@
                         </div>
                     </div>
                 </div>
+
+                <div>
+                    <h2>#{AdminMessages['imexport.activeexports.heading']}</h2>
+
+                    <c:choose>
+                        <c:when test="#{ImportExportTaskManager.exportTasks.isEmpty()}">
+                            <p>
+                                #{AdminMessages['imexport.activeexports.none']}
+                            </p>
+                        </c:when>
+                        <c:otherwise>
+                            <table class="table table-hover">
+                                <thead>
+                                    <tr>
+                                        <th>#{AdminMessages['imexport.activeexports.table.columns.name.heading']}</th>
+                                        <th>#{AdminMessages['imexport.activeexports.table.columns.started.heading']}</th>
+                                        <th>#{AdminMessages['imexport.activeexports.table.columns.status.heading']}</th>
+                                        <th>#{AdminMessages['imexport.activeexports.table.columns.actions.heading']}</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <c:forEach items="#{ImportExportTaskManager.exportTasks}" var="task">
+                                        <tr>
+                                            <td>#{task.name}</td>
+                                            <td>#{task.started}</td>
+                                            <td>
+                                                <c:choose>
+                                                    <c:when test="#{task.done}">
+                                                        #{AdminMessages['imexport.activeexports.table.columns.status.finished']}
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        #{AdminMessages['imexport.activeexports.table.columns.status.running']}
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </td>
+                                            <td>
+                                                <a class="btn btn-warning" href="#">
+                                                    #{AdminMessages['imexport.activeexports.table.columns.actions.button_label']}
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    </c:forEach>
+                                </tbody>
+                            </table>
+                        </c:otherwise>
+                    </c:choose>
+                </div>
+                
+                <div>
+                    <h2>#{AdminMessages['imexport.activeimports.heading']}</h2>
+
+                    <c:choose>
+                        <c:when test="#{ImportExportTaskManager.importTasks.isEmpty()}">
+                            <p>
+                                #{AdminMessages['imexport.activeimports.none']}
+                            </p>
+                        </c:when>
+                        <c:otherwise>
+                            <table class="table table-hover">
+                                <thead>
+                                    <tr>
+                                        <th>#{AdminMessages['imexport.activeimports.table.columns.name.heading']}</th>
+                                        <th>#{AdminMessages['imexport.activeimports.table.columns.started.heading']}</th>
+                                        <th>#{AdminMessages['imexport.activeimports.table.columns.status.heading']}</th>
+                                        <th>#{AdminMessages['imexport.activeimports.table.columns.actions.heading']}</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <c:forEach items="#{ImportExportTaskManager.importTasks}" var="task">
+                                        <tr>
+                                            <td>#{task.name}</td>
+                                            <td>#{task.started}</td>
+                                            <td>
+                                                <c:choose>
+                                                    <c:when test="#{task.done}">
+                                                        #{AdminMessages['imexport.activeimports.table.columns.status.finished']}
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        #{AdminMessages['imexport.activeimports.table.columns.status.running']}
+                                                    </c:otherwise>
+                                                </c:choose>
+                                            </td>
+                                            <td>
+                                                <a class="btn btn-warning" href="#">
+                                                    #{AdminMessages['imexport.activeimports.table.columns.actions.button_label']}
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    </c:forEach>
+                                </tbody>
+                            </table>
+                        </c:otherwise>
+                    </c:choose>
+                </div>
             </div>
         </ui:define>
 
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index cd568dd92..2de1c0183 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -536,3 +536,23 @@ imexport.export.export_name.help=Name of the export archive
 imexport.export.export_name.label=to
 imexport.export.submit=Export
 imexport.export.cancel=Cancel
+imexport.export.exportentities.help=Select the entity types to export. Additional required types will be selected automatically
+imexport.export.exportentities.label=Export types
+imexport.activeexports.heading=Active Exports
+imexport.activeexports.table.columns.name.heading=Name
+imexport.activeexports.table.columns.started.heading=Started
+imexport.activeexports.table.columns.status.heading=Status
+imexport.activeexports.table.columns.actions.heading=Actions
+imexport.activeexports.table.columns.status.finished=Finished
+imexport.activeexports.table.columns.status.running=In progress
+imexport.activeexports.table.columns.actions.button_label=Cancel
+imexport.activeexports.none=No active exports
+imexport.activeimports.heading=Active Imports
+imexport.activeimports.none=No active imports
+imexport.activeimports.table.columns.name.heading=Name
+imexport.activeimports.table.columns.started.heading=Started
+imexport.activeimports.table.columns.status.heading=Status
+imexport.activeimports.table.columns.actions.heading=Actions
+imexport.activeimports.table.columns.status.finished=Finished
+imexport.activeimports.table.columns.status.running=In progress
+imexport.activeimports.table.columns.actions.button_label=Cancel
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 6b488ba9d..79c56bf03 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -536,3 +536,23 @@ imexport.export.export_name.help=Name des Export Archives
 imexport.export.export_name.label=nach
 imexport.export.submit=Exportieren
 imexport.export.cancel=Abbrechen
+imexport.export.exportentities.help=W\u00e4hlen Sie die zu exportierenden Typen aus. Weitere ben\u00f6tigte Typen werden automatisch ausgew\u00e4hlt.
+imexport.export.exportentities.label=Exportiere
+imexport.activeexports.heading=Aktive Exporte
+imexport.activeexports.table.columns.name.heading=Name
+imexport.activeexports.table.columns.started.heading=Gestartet
+imexport.activeexports.table.columns.status.heading=Status
+imexport.activeexports.table.columns.actions.heading=Aktionen
+imexport.activeexports.table.columns.status.finished=Abgeschlossen
+imexport.activeexports.table.columns.status.running=In Arbeit
+imexport.activeexports.table.columns.actions.button_label=Abbrechen
+imexport.activeexports.none=Keine aktiven Exporte
+imexport.activeimports.heading=Aktive Importe
+imexport.activeimports.none=Keine aktiven Importe
+imexport.activeimports.table.columns.name.heading=Name
+imexport.activeimports.table.columns.started.heading=Gestartet
+imexport.activeimports.table.columns.status.heading=Status
+imexport.activeimports.table.columns.actions.heading=Aktionen
+imexport.activeimports.table.columns.status.finished=Abgeschlossen
+imexport.activeimports.table.columns.status.running=In Arbeit
+imexport.activeimports.table.columns.actions.button_label=Abbrechen

From 95375541495a27ffa9ef87a8c583de23fa8cc332 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 8 Dec 2020 20:26:13 +0100
Subject: [PATCH 90/93] Added a reload method to the interface of the
 AbstractImExporter class

---
 .../AbstractContentItemImExporter.java        |  32 +++-
 .../ContentSectionImExporter.java             |  15 ++
 .../categorization/Categorization.java        |  20 +--
 .../CategorizationImExporter.java             |  29 +++-
 .../categorization/CategoryImExporter.java    |  15 ++
 .../categorization/DomainImExporter.java      |  27 +++-
 .../categorization/DomainOwnership.java       |  12 +-
 .../DomainOwnershipImExporter.java            |  31 +++-
 .../libreccm/core/ResourceTypeImExporter.java |  20 ++-
 .../imexport/AbstractEntityImExporter.java    |  31 +++-
 .../libreccm/security/GroupImExporter.java    |  32 ++--
 .../libreccm/security/GroupMembership.java    |  25 +++-
 .../security/GroupMembershipImExporter.java   |  30 +++-
 .../security/PermissionImExporter.java        |  29 ++--
 .../org/libreccm/security/RoleImExporter.java |  55 ++++++-
 .../org/libreccm/security/RoleMembership.java |  19 ++-
 .../security/RoleMembershipImExporter.java    |  29 +++-
 .../org/libreccm/security/UserImExporter.java |  21 ++-
 .../ui/admin/imexport/ExportTask.java         |  71 +++++++++
 .../ui/admin/imexport/ExportTaskStatus.java   | 140 ++++++++++++++++++
 ...xportTask.java => ImExportTaskStatus.java} |  15 +-
 .../imexport/ImExportTaskStatusEnum.java      |  31 ++++
 .../ui/admin/imexport/ImExportTasks.java      |  49 ++++--
 .../imexport/ImportExportTaskManager.java     |  95 ++++++++----
 .../ui/admin/imexport/ImportTask.java         |  46 ++++++
 .../ui/admin/imexport/ImportTaskStatus.java   |  95 ++++++++++++
 .../libreccm/web/ApplicationImExporter.java   |  17 ++-
 .../workflow/AssignableTaskImExporter.java    |  19 ++-
 .../org/libreccm/workflow/TaskAssignment.java |  33 ++++-
 .../workflow/TaskAssignmentImExporter.java    |  36 ++++-
 .../workflow/TaskCommentImExporter.java       |  16 +-
 .../org/libreccm/workflow/TaskDependency.java |  26 +++-
 .../workflow/TaskDependencyImExporter.java    |  33 ++++-
 .../libreccm/workflow/WorkflowImExporter.java |  19 ++-
 .../libreccm/ui/admin/imexport/imexport.xhtml |  17 +--
 .../docrepo/BlobObjectImExporter.java         |  19 ++-
 .../org/libreccm/docrepo/FileImExporter.java  |  25 +++-
 .../libreccm/docrepo/FolderImExporter.java    |  19 ++-
 .../docrepo/RepositoryImExporter.java         |  23 ++-
 39 files changed, 1107 insertions(+), 209 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTask.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java
 rename ccm-core/src/main/java/org/libreccm/ui/admin/imexport/{ImExportTask.java => ImExportTaskStatus.java} (88%)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatusEnum.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java

diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/AbstractContentItemImExporter.java b/ccm-cms/src/main/java/org/librecms/contentsection/AbstractContentItemImExporter.java
index 2de70e2c1..6098f25c8 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/AbstractContentItemImExporter.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/AbstractContentItemImExporter.java
@@ -10,6 +10,7 @@ import org.libreccm.imexport.AbstractEntityImExporter;
 import org.libreccm.imexport.Exportable;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.inject.Inject;
@@ -20,26 +21,41 @@ import javax.transaction.Transactional;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @param <T>
  */
-public abstract class AbstractContentItemImExporter<T extends ContentItem> 
+public abstract class AbstractContentItemImExporter<T extends ContentItem>
     extends AbstractEntityImExporter<T> {
-    
+
     @Inject
-    private ContentItemRepository itemRepository; 
-    
+    private ContentItemRepository itemRepository;
+
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-        
+
         final Set<Class<? extends Exportable>> entities = new HashSet<>();
         entities.add(Category.class);
         entities.add(ContentSection.class);
-        
+
         return entities;
     }
-    
+
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     public void saveImportedEntity(final T entity) {
         itemRepository.save(entity);
     }
-    
+
+    @Override
+    protected T reloadEntity(final T entity) {
+        return itemRepository
+            .findById(
+                Objects.requireNonNull(entity).getObjectId(), getEntityClass()
+            ).orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "ContentItem entity %s not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
index a2cf7ecd0..d4405055c 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
@@ -10,6 +10,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
@@ -44,4 +45,18 @@ public class ContentSectionImExporter
         sectionRepository.save(entity);
     }
 
+    @Override
+    protected ContentSection reloadEntity(final ContentSection entity) {
+        return sectionRepository
+            .findById(Objects.requireNonNull(entity).getObjectId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "ContentSection entity %s not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java b/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java
index 5b8b0f528..f5556b22f 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java
@@ -54,6 +54,11 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "CATEGORIZATIONS", schema = DB_SCHEMA)
 @NamedQueries({
+    @NamedQuery(
+        name = "Categorization.findById",
+        query
+        = "SELECT c FROM Categorization c WHERE c.categorizationId = :categorizationId"
+    ),
     @NamedQuery(
         name = "Categorization.findByUuid",
         query = "SELECT c FROM Categorization c WHERE c.uuid = :uuid"
@@ -62,36 +67,31 @@ import javax.persistence.Table;
         name = "Categorization.find",
         query = "SELECT c FROM Categorization c "
                     + "WHERE c.category = :category "
-                    + "AND c.categorizedObject = :object")
-    ,
+                    + "AND c.categorizedObject = :object"),
     @NamedQuery(
         name = "Categorization.isAssignedTo",
         query = "SELECT (CASE WHEN COUNT(c) > 0 THEN true ELSE false END) "
                     + "FROM Categorization c "
                     + "WHERE c.category = :category "
-                    + "AND c.categorizedObject = :object")
-    ,
+                    + "AND c.categorizedObject = :object"),
     @NamedQuery(
         name = "Categorization.isAssignedToWithType",
         query = "SELECT (CASE WHEN COUNT(c) > 0 THEN true ELSE false END) "
                     + "FROM Categorization c "
                     + "WHERE c.category = :category "
                     + "AND c.categorizedObject = :object "
-                    + "AND c.type = :type")
-    ,
+                    + "AND c.type = :type"),
     @NamedQuery(
         name = "Categorization.findIndexObject",
         query = "SELECT c.categorizedObject FROM Categorization c "
                     + "WHERE c.category = :category "
-                    + "AND c.indexObject = TRUE")
-    ,
+                    + "AND c.indexObject = TRUE"),
     @NamedQuery(
         name = "Categorization.findIndexObjectCategorization",
         query = "SELECT c FROM Categorization c "
                     + "WHERE c.category = :category "
                     + "AND c.indexObject = TRUE"
-    )
-    ,
+    ),
     @NamedQuery(
         name = "Categorization.hasIndexObject",
         query = "SELECT (CASE WHEN COUNT(c.categorizedObject) > 0 THEN true "
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategorizationImExporter.java b/ccm-core/src/main/java/org/libreccm/categorization/CategorizationImExporter.java
index 45b6a74b1..aa7e64555 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/CategorizationImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategorizationImExporter.java
@@ -23,17 +23,20 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.TypedQuery;
 import javax.transaction.Transactional;
 
 /**
  * Exporter/Importer for {@link Categorization} entities.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
@@ -54,10 +57,9 @@ public class CategorizationImExporter
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-
         final Set<Class<? extends Exportable>> entities = new HashSet<>();
         entities.add(Category.class);
-        
+
         dependenciesProviders.forEach(
             provider -> entities.addAll(provider.getCategorizableEntities())
         );
@@ -68,8 +70,27 @@ public class CategorizationImExporter
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final Categorization entity) {
-
         entityManager.persist(entity);
     }
 
+    @Override
+    protected Categorization reloadEntity(final Categorization entity) {
+        try {
+            return entityManager.createNamedQuery(
+                "Categorization.findById",
+                Categorization.class
+            ).setParameter(
+                "categorizationId",
+                Objects.requireNonNull(entity).getCategorizationId()
+            ).getSingleResult();
+        } catch (NoResultException ex) {
+            throw new IllegalArgumentException(
+                String.format(
+                    "Categorization entity %s was not found in the database.",
+                    Objects.toString(entity)
+                )
+            );
+        }
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java
index 9012e6245..e851ce5e0 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryImExporter.java
@@ -23,6 +23,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
@@ -60,4 +61,18 @@ public class CategoryImExporter extends AbstractEntityImExporter<Category> {
         categoryRepository.save(entity);
     }
 
+    @Override
+    protected Category reloadEntity(final Category entity) {
+        return categoryRepository
+            .findById(Objects.requireNonNull(entity).getObjectId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "Category entity %s does not exist in the database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java
index 2dda0ebfc..33c475539 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainImExporter.java
@@ -23,6 +23,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
@@ -30,7 +31,7 @@ import javax.inject.Inject;
 
 /**
  * Exporter/Importer for {@link Domain} entities.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
@@ -39,10 +40,10 @@ public class DomainImExporter extends AbstractEntityImExporter<Domain> {
 
     @Inject
     private DomainRepository domainRepository;
-    
+
     @Override
     public Class<Domain> getEntityClass() {
-        
+
         return Domain.class;
     }
 
@@ -54,10 +55,22 @@ public class DomainImExporter extends AbstractEntityImExporter<Domain> {
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-        
+
         return Collections.emptySet();
     }
-    
-    
-    
+
+    @Override
+    protected Domain reloadEntity(final Domain entity) {
+        return domainRepository
+            .findById(Objects.requireNonNull(entity).getObjectId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "Domain entity %s was not found in the database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnership.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnership.java
index db2a9ff65..09a77f170 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnership.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnership.java
@@ -54,11 +54,15 @@ import javax.xml.bind.annotation.XmlElement;
 @Entity
 @Table(name = "DOMAIN_OWNERSHIPS", schema = DB_SCHEMA)
 @NamedQueries({
+    @NamedQuery(
+        name = "DomainOwnership.findById",
+        query
+        = "SELECT o FROM DomainOwnership o WHERE o.ownershipId = :ownershipId"
+    ),
     @NamedQuery(
         name = "DomainOwnership.findByUuid",
         query = "SELECT o FROM DomainOwnership o WHERE o.uuid = :uuid"
-    )
-    ,
+    ),
     @NamedQuery(
         name = "DomainOwnership.findByOwnerAndDomain",
         query = "SELECT o FROM DomainOwnership o "
@@ -77,7 +81,7 @@ public class DomainOwnership implements Serializable, Exportable {
     @Column(name = "OWNERSHIP_ID")
     @GeneratedValue(strategy = GenerationType.AUTO)
     private long ownershipId;
-    
+
     @Column(name = "UUID", unique = true, nullable = false)
     @XmlElement(name = "uuid", namespace = CoreConstants.CORE_XML_NS)
     private String uuid;
@@ -132,7 +136,7 @@ public class DomainOwnership implements Serializable, Exportable {
     public void setUuid(final String uuid) {
         this.uuid = uuid;
     }
-    
+
     public CcmApplication getOwner() {
         return owner;
     }
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnershipImExporter.java b/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnershipImExporter.java
index 1fda262bb..65dd84feb 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnershipImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/DomainOwnershipImExporter.java
@@ -24,17 +24,19 @@ import org.libreccm.imexport.Processes;
 import org.libreccm.web.CcmApplication;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 import javax.transaction.Transactional;
 
 /**
  * Exporter/Importer for {@link DomainOwnership} entities.
- * 
- * 
+ *
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
@@ -47,20 +49,17 @@ public class DomainOwnershipImExporter
 
     @Override
     public Class<DomainOwnership> getEntityClass() {
-
         return DomainOwnership.class;
     }
 
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final DomainOwnership entity) {
-
         entityManager.persist(entity);
     }
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-
         final Set<Class<? extends Exportable>> classes = new HashSet<>();
         classes.add(CcmApplication.class);
         classes.add(Domain.class);
@@ -68,4 +67,26 @@ public class DomainOwnershipImExporter
         return classes;
     }
 
+    @Override
+    protected DomainOwnership reloadEntity(final DomainOwnership entity) {
+        try {
+            return entityManager
+                .createNamedQuery(
+                    "DomainOwnership.findById",
+                    DomainOwnership.class
+                )
+                .setParameter(
+                    "ownershipId",
+                    Objects.requireNonNull(entity.getOwnershipId())
+                ).getSingleResult();
+        } catch (NoResultException ex) {
+            throw new IllegalArgumentException(
+                String.format(
+                    "DomainOwnership entity %s not found in database.",
+                    Objects.toString(entity)
+                )
+            );
+        }
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeImExporter.java b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeImExporter.java
index 8262c43ed..771e3d05a 100644
--- a/ccm-core/src/main/java/org/libreccm/core/ResourceTypeImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/core/ResourceTypeImExporter.java
@@ -23,6 +23,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.inject.Inject;
@@ -45,15 +46,30 @@ public class ResourceTypeImExporter
 
     @Override
     protected void saveImportedEntity(final ResourceType entity) {
-        
         repository.save(entity);
     }
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-        
         return Collections.emptySet();
     }
+
+    @Override
+    protected ResourceType reloadEntity(final ResourceType entity) {
+        return repository
+            .findById(
+                Objects.requireNonNull(entity).getResourceTypeId()
+            )
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "The provided ResourceType %s was not found in the "
+                            + "database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
     
     
     
diff --git a/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java b/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
index e4bbeb207..02ea6ca81 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
@@ -62,7 +62,6 @@ public abstract class AbstractEntityImExporter<T extends Exportable> {
      * containers usually create a {@link java.lang.reflect.Proxy} class and
      * there is no portable way to unproxy a class.
      *
-     *
      * @return A {@link Set} of exportable entity classes which should be
      *         processed before the entities which are processed by this
      *         implementation. If the implementation has no dependencies an
@@ -72,7 +71,6 @@ public abstract class AbstractEntityImExporter<T extends Exportable> {
 
     @Transactional(Transactional.TxType.REQUIRED)
     public T importEntity(final String data) throws ImportExpection {
-
         try {
             final T entity = objectMapper.readValue(data, getEntityClass());
             saveImportedEntity(entity);
@@ -80,13 +78,26 @@ public abstract class AbstractEntityImExporter<T extends Exportable> {
         } catch (IOException ex) {
             throw new ImportExpection(ex);
         }
-
     }
 
+    protected abstract void saveImportedEntity(T entity);
+
+    /**
+     * Export an entity (as JSON). There should be no need to overwrite this
+     * method.
+     *
+     * @param entity The entity to export.
+     *
+     * @return The entity as JSON
+     *
+     * @throws ExportException If an error occurs.
+     */
     @Transactional(Transactional.TxType.REQUIRED)
     public String exportEntity(final Exportable entity) throws ExportException {
+        @SuppressWarnings("unchecked")
+        final T export = reloadEntity((T) entity);
         try {
-            return objectMapper.writeValueAsString(entity);
+            return objectMapper.writeValueAsString(export);
         } catch (JsonProcessingException ex) {
             throw new ExportException(String.format(
                 "Failed to export entity \"%s\" of type \"%s\".",
@@ -94,9 +105,17 @@ public abstract class AbstractEntityImExporter<T extends Exportable> {
                 getEntityClass().getName()),
                                       ex);
         }
-
     }
 
-    protected abstract void saveImportedEntity(T entity);
+    /**
+     * Reloads the entity to export. Entities become detacted for several
+     * reasons before they are passed to the null     {@link #exportEntity(org.libreccm.imexport.Exportable) method. The 
+     * implementation of this should reload the passed entity.
+     *
+     * @param entity The entity to reload.
+     *
+     * @return The reloaded entity
+     */
+    protected abstract T reloadEntity(final T entity);
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupImExporter.java b/ccm-core/src/main/java/org/libreccm/security/GroupImExporter.java
index 669c6bd45..f3185f2ee 100644
--- a/ccm-core/src/main/java/org/libreccm/security/GroupImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/GroupImExporter.java
@@ -23,6 +23,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
@@ -32,37 +33,48 @@ import javax.transaction.Transactional;
 
 /**
  * Exporter/Importer for {@link Group}s.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
 @Processes(Group.class)
 public class GroupImExporter extends AbstractEntityImExporter<Group> {
-    
+
     @Inject
     private EntityManager entityManager;
-    
+
     @Inject
     private GroupRepository groupRepository;
-    
+
     @Override
     public Class<Group> getEntityClass() {
         return Group.class;
     }
-    
+
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final Group entity) {
-        
         entity.setPartyId(0);
-//        groupRepository.save(entity);
         entityManager.persist(entity);
     }
-    
+
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-        
         return Collections.emptySet();
     }
-    
+
+    @Override
+    protected Group reloadEntity(final Group entity) {
+        return groupRepository
+            .findById(Objects.requireNonNull(entity).getPartyId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "Group entity %s was not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java b/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java
index 533f97c36..580713cd6 100644
--- a/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java
+++ b/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java
@@ -56,14 +56,25 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "GROUP_MEMBERSHIPS", schema = DB_SCHEMA)
 @NamedQueries({
-    @NamedQuery(name = "GroupMembership.findByUuid",
-                query = "SELECT m FROM GroupMembership m WHERE m.uuid = :uuid"),
-    @NamedQuery(name = "GroupMembership.findByGroupAndUser",
-                query = "SELECT m FROM GroupMembership m "
-                            + "WHERE m.member = :member AND m.group = :group")})
+    @NamedQuery(
+        name = "GroupMembership.findById",
+        query
+        = "SELECT m FROM GroupMembership m WHERE m.membershipId = :membershipId"
+    ),
+    @NamedQuery(
+        name = "GroupMembership.findByUuid",
+        query = "SELECT m FROM GroupMembership m WHERE m.uuid = :uuid"
+    ),
+    @NamedQuery(
+        name = "GroupMembership.findByGroupAndUser",
+        query = "SELECT m FROM GroupMembership m "
+                    + "WHERE m.member = :member AND m.group = :group")
+})
 @XmlRootElement(name = "group-membership", namespace = CORE_XML_NS)
-@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
-                  property = "uuid")
+@JsonIdentityInfo(
+    generator = ObjectIdGenerators.PropertyGenerator.class,
+    property = "uuid"
+)
 public class GroupMembership implements Serializable, Exportable {
 
     private static final long serialVersionUID = 83192968306850665L;
diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipImExporter.java b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipImExporter.java
index fdda99ce8..a9a513591 100644
--- a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipImExporter.java
@@ -23,10 +23,12 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 import javax.transaction.Transactional;
 
 /**
@@ -36,9 +38,9 @@ import javax.transaction.Transactional;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Processes(GroupMembership.class)
-public class GroupMembershipImExporter 
+public class GroupMembershipImExporter
     extends AbstractEntityImExporter<GroupMembership> {
-    
+
     @Inject
     private EntityManager entityManager;
 
@@ -49,7 +51,6 @@ public class GroupMembershipImExporter
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-
         final Set<Class<? extends Exportable>> entities = new HashSet<>();
         entities.add(User.class);
         entities.add(Group.class);
@@ -60,9 +61,30 @@ public class GroupMembershipImExporter
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final GroupMembership entity) {
-
         entity.setMembershipId(0);
         entityManager.persist(entity);
     }
 
+    @Override
+    protected GroupMembership reloadEntity(final GroupMembership entity) {
+        try {
+            return entityManager
+                .createNamedQuery(
+                    "GroupMembership.findById", GroupMembership.class
+                )
+                .setParameter(
+                    "membershipId",
+                    Objects.requireNonNull(entity).getMembershipId()
+                )
+                .getSingleResult();
+        } catch (NoResultException ex) {
+            throw new IllegalArgumentException(
+                String.format(
+                    "GroupMembership entity %s does not exist in the database.",
+                    Objects.toString(entity)
+                )
+            );
+        }
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java b/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java
index f51633d09..fdf832a8f 100644
--- a/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/PermissionImExporter.java
@@ -23,6 +23,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
@@ -30,16 +31,16 @@ import javax.inject.Inject;
 
 /**
  * Exporter/Importer for {@link Permission}s.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
 @Processes(Permission.class)
-public class PermissionImExporter extends AbstractEntityImExporter<Permission>{
+public class PermissionImExporter extends AbstractEntityImExporter<Permission> {
 
     @Inject
     private PermissionRepository permissionRepository;
-    
+
     @Override
     public Class<Permission> getEntityClass() {
         return Permission.class;
@@ -47,19 +48,29 @@ public class PermissionImExporter extends AbstractEntityImExporter<Permission>{
 
     @Override
     protected void saveImportedEntity(final Permission entity) {
-        
         permissionRepository.save(entity);
     }
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-        
         final Set<Class<? extends Exportable>> classes = new HashSet<>();
         classes.add(Role.class);
-        
+
         return classes;
     }
-    
-    
-    
+
+    @Override
+    protected Permission reloadEntity(final Permission entity) {
+        return permissionRepository
+            .findById(Objects.requireNonNull(entity).getPermissionId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "Permission entity %s not found in the database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java b/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java
index 2f2656163..ace2a41ac 100644
--- a/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/RoleImExporter.java
@@ -18,44 +18,85 @@
  */
 package org.libreccm.security;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.libreccm.core.UnexpectedErrorException;
 import org.libreccm.imexport.AbstractEntityImExporter;
 import org.libreccm.imexport.ExportException;
 import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
+import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
 
 /**
  * Exporter/Importer for {@link Role}s.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+@Dependent
 @Processes(Role.class)
 public class RoleImExporter extends AbstractEntityImExporter<Role> {
 
+    private static final Logger LOGGER = LogManager.getLogger(
+        RoleImExporter.class);
+
+    @Inject
+    private EntityManager entityManager;
+
     @Inject
     private RoleRepository roleRepository;
-    
+
     @Override
     public Class<Role> getEntityClass() {
         return Role.class;
     }
 
+    @Transactional(Transactional.TxType.REQUIRED)
+    @Override
+    public String exportEntity(final Exportable entity) throws ExportException {
+        final Role role = roleRepository
+            .findById(((Role) entity).getRoleId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "Provided entity %d does not exist in database.",
+                        entity)
+                )
+            );
+        role.getDescription().getValues().forEach((locale, value) -> LOGGER
+            .info("{}: {}", locale, value));
+        return super.exportEntity(entity);
+    }
+
     @Override
     protected void saveImportedEntity(final Role entity) {
-        
         roleRepository.save(entity);
     }
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-
         return Collections.emptySet();
     }
-    
-    
-    
+
+    @Override
+    protected Role reloadEntity(final Role entity) {
+        return roleRepository
+            .findById(Objects.requireNonNull(entity).getRoleId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "Role entity %s not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java b/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java
index 6aebd8d9c..af8c01d28 100644
--- a/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java
+++ b/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java
@@ -56,11 +56,20 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "ROLE_MEMBERSHIPS", schema = DB_SCHEMA)
 @NamedQueries({
-    @NamedQuery(name = "RoleMembership.findByUuid",
-                query = "SELECT m FROM RoleMembership m WHERE m.uuid = :uuid"),
-    @NamedQuery(name = "RoleMembership.findByRoleAndMember",
-                query = "SELECT m FROM RoleMembership m "
-                            + "WHERE m.member = :member AND m.role = :role")
+    @NamedQuery(
+        name = "RoleMembership.findById",
+        query
+        = "SELECT m FROM RoleMembership m WHERE m.membershipId = :membershipId"
+    ),
+    @NamedQuery(
+        name = "RoleMembership.findByUuid",
+        query = "SELECT m FROM RoleMembership m WHERE m.uuid = :uuid"
+    ),
+    @NamedQuery(
+        name = "RoleMembership.findByRoleAndMember",
+        query
+        = "SELECT m FROM RoleMembership m WHERE m.member = :member AND m.role = :role"
+    )
 })
 @XmlRootElement(name = "role-membership", namespace = CORE_XML_NS)
 @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleMembershipImExporter.java b/ccm-core/src/main/java/org/libreccm/security/RoleMembershipImExporter.java
index 0c9d82f10..c3679a1d8 100644
--- a/ccm-core/src/main/java/org/libreccm/security/RoleMembershipImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/RoleMembershipImExporter.java
@@ -23,15 +23,17 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 import javax.transaction.Transactional;
 
 /**
  * Exporter/Importer for {@link RoleMembership}s.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Processes(RoleMembership.class)
@@ -49,19 +51,38 @@ public class RoleMembershipImExporter
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final RoleMembership entity) {
-
         entityManager.persist(entity);
     }
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-
         final Set<Class<? extends Exportable>> classes = new HashSet<>();
         classes.add(User.class);
         classes.add(Group.class);
         classes.add(Role.class);
-        
+
         return classes;
     }
 
+    @Override
+    protected RoleMembership reloadEntity(final RoleMembership entity) {
+        try {
+            return entityManager
+                .createNamedQuery(
+                    "RoleMembership.findById", RoleMembership.class
+                )
+                .setParameter(
+                    "membershipId",
+                    Objects.requireNonNull(entity).getMembershipId()
+                ).getSingleResult();
+        } catch (NoResultException ex) {
+            throw new IllegalArgumentException(
+                String.format(
+                    "RoleMembeship entity %s not found in database.",
+                    Objects.toString(entity)
+                )
+            );
+        }
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/security/UserImExporter.java b/ccm-core/src/main/java/org/libreccm/security/UserImExporter.java
index 5f4e29943..9abe63a00 100644
--- a/ccm-core/src/main/java/org/libreccm/security/UserImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/UserImExporter.java
@@ -23,6 +23,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
@@ -32,7 +33,7 @@ import javax.transaction.Transactional;
 
 /**
  * Exporter/Importer for users.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
@@ -41,7 +42,7 @@ public class UserImExporter extends AbstractEntityImExporter<User> {
 
     @Inject
     private EntityManager entityManager;
-    
+
     @Inject
     private UserRepository userRepository;
 
@@ -53,7 +54,6 @@ public class UserImExporter extends AbstractEntityImExporter<User> {
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final User entity) {
-
         // Reset partyId.
         entity.setPartyId(0);
 //        userRepository.save(entity);
@@ -62,8 +62,21 @@ public class UserImExporter extends AbstractEntityImExporter<User> {
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-
         return Collections.emptySet();
     }
 
+    @Override
+    protected User reloadEntity(final User entity) {
+        return userRepository
+            .findById(Objects.requireNonNull(entity).getPartyId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "User entity %s was not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTask.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTask.java
new file mode 100644
index 000000000..6ecbc907e
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTask.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.imexport;
+
+import org.libreccm.imexport.Exportable;
+
+import java.time.LocalDate;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class ExportTask {
+
+    private final String name;
+
+    private final LocalDate started;
+
+    private final Collection<Exportable> entities;
+    
+    private final ExportTaskStatus status;
+
+    public ExportTask(
+        final String name,
+        final LocalDate started,
+        final Collection<Exportable> entities,
+        final ExportTaskStatus status
+    ) {
+        this.name = name;
+        this.started = started;
+        this.entities = entities;
+        this.status = status;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public LocalDate getStarted() {
+        return started;
+    }
+
+    public Collection<Exportable> getEntities() {
+        return Collections.unmodifiableCollection(entities);
+    }
+
+    public ExportTaskStatus getStatus() {
+        return status;
+    }
+    
+    
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java
new file mode 100644
index 000000000..9b49f1bc8
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.imexport;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Comparator;
+import java.util.Objects;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class ExportTaskStatus implements Comparable<ExportTaskStatus> {
+
+    private String name;
+
+    private LocalDateTime started;
+
+    private ImExportTaskStatusEnum status;
+
+    private Throwable exception;
+
+    public String getName() {
+        return name;
+    }
+
+    protected void setName(final String name) {
+        this.name = name;
+    }
+
+    public LocalDateTime getStarted() {
+        return started;
+    }
+
+    protected void setStarted(final LocalDateTime started) {
+        this.started = started;
+    }
+
+    public ImExportTaskStatusEnum getStatus() {
+        return status;
+    }
+
+    protected void setStatus(final ImExportTaskStatusEnum status) {
+        this.status = status;
+    }
+
+    public Throwable getException() {
+        return exception;
+    }
+
+    protected void setException(final Throwable exception) {
+        this.exception = exception;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 97 * hash + Objects.hashCode(name);
+        hash = 97 * hash + Objects.hashCode(started);
+        hash = 97 * hash + Objects.hashCode(status);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof ExportTaskStatus)) {
+            return false;
+        }
+        final ExportTaskStatus other = (ExportTaskStatus) obj;
+        if (!other.canEqual(this)) {
+            return false;
+        }
+        if (!Objects.equals(name, other.getName())) {
+            return false;
+        }
+        if (!Objects.equals(started, other.getStarted())) {
+            return false;
+        }
+        return status == other.getStatus();
+    }
+
+    public boolean canEqual(final Object obj) {
+        return obj instanceof ImExportTaskStatus;
+    }
+
+    @Override
+    public int compareTo(final ExportTaskStatus other) {
+        return Comparator
+            .nullsFirst(Comparator
+                .comparing(ExportTaskStatus::getName)
+                .thenComparing(ExportTaskStatus::getStarted)
+                .thenComparing(ExportTaskStatus::getStatus)
+            )
+            .compare(this, other);
+    }
+
+    @Override
+    public String toString() {
+        return String.format(
+            "%s{ "
+                + "name = %s, "
+                + "started = %s, "
+                + "status = %s, "
+                + "expection = %s"
+                + " }",
+            super.toString(),
+            name,
+            DateTimeFormatter.ISO_DATE_TIME.withZone(
+                ZoneId.systemDefault()
+            ).format(started),
+            Objects.toString(status),
+            Objects.toString(exception)
+        );
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTask.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatus.java
similarity index 88%
rename from ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTask.java
rename to ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatus.java
index da1688804..1601aebe7 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTask.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatus.java
@@ -18,7 +18,6 @@
  */
 package org.libreccm.ui.admin.imexport;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -30,7 +29,7 @@ import java.util.concurrent.Future;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class ImExportTask implements Comparable<ImExportTask> {
+public class ImExportTaskStatus implements Comparable<ImExportTaskStatus> {
 
     private String name;
 
@@ -92,10 +91,10 @@ public class ImExportTask implements Comparable<ImExportTask> {
         if (obj == null) {
             return false;
         }
-        if (!(obj instanceof ImExportTask)) {
+        if (!(obj instanceof ImExportTaskStatus)) {
             return false;
         }
-        final ImExportTask other = (ImExportTask) obj;
+        final ImExportTaskStatus other = (ImExportTaskStatus) obj;
         if (!other.canEqual(this)) {
             return false;
         }
@@ -106,15 +105,15 @@ public class ImExportTask implements Comparable<ImExportTask> {
     }
 
     public boolean canEqual(final Object obj) {
-        return obj instanceof ImExportTask;
+        return obj instanceof ImExportTaskStatus;
     }
 
     @Override
-    public int compareTo(final ImExportTask other) {
+    public int compareTo(final ImExportTaskStatus other) {
         return Comparator
             .nullsFirst(Comparator
-                .comparing(ImExportTask::getName)
-                .thenComparing(ImExportTask::getStarted)
+                .comparing(ImExportTaskStatus::getName)
+                .thenComparing(ImExportTaskStatus::getStarted)
             )
             .compare(this, other);
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatusEnum.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatusEnum.java
new file mode 100644
index 000000000..2d4889445
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatusEnum.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.imexport;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public enum ImExportTaskStatusEnum {
+
+    ERROR,
+    FINISHED,
+    RUNNING,
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
index 4e425ac38..51dc46149 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
@@ -26,9 +26,12 @@ import java.util.concurrent.Future;
 
 import javax.ejb.AsyncResult;
 import javax.ejb.Asynchronous;
+import javax.ejb.Singleton;
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.ObservesAsync;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 
@@ -36,29 +39,45 @@ import javax.transaction.Transactional;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-@Stateless
+@ApplicationScoped
 public class ImExportTasks {
 
     @Inject
     private ImportExport importExport;
 
-    @Asynchronous
-    @Transactional(Transactional.TxType.REQUIRES_NEW)
-    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-    public Future<?> startExport(
-        final Collection<Exportable> entities,
-        final String exportName
-    ) {
+//    @Asynchronous
+//    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+//    public Future<?> startExport(
+//        final Collection<Exportable> entities,
+//        final String exportName
+//    ) {
+//        importExport.exportEntities(entities, exportName);
+//        return new AsyncResult<>(null);
+//    }
+//
+//    @Asynchronous
+//    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+//    public Future<?> startImport(final String importName) {
+//        importExport.importEntities(importName);
+//        return new AsyncResult<>(null);
+//    }
+    
+    @Transactional(Transactional.TxType.REQUIRED)
+    public ExportTask exportEntities(@ObservesAsync final ExportTask task) {
+        final Collection<Exportable> entities = task.getEntities();
+        final String exportName = task.getName();
+        
         importExport.exportEntities(entities, exportName);
-        return new AsyncResult<>(null);
+        task.getStatus().setStatus(ImExportTaskStatusEnum.FINISHED);
+        return task;
     }
-
-    @Asynchronous
-    @Transactional(Transactional.TxType.REQUIRES_NEW)
-    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-    public Future<?> startImport(final String importName) {
+    
+    @Transactional(Transactional.TxType.REQUIRED)
+    public void importEntitites(@ObservesAsync final ImExportTaskStatus task) {
+        final String importName = task.getName();
+        
         importExport.importEntities(importName);
-        return new AsyncResult<>(null);
     }
+    
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
index 546ed1c71..2c5313815 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
@@ -18,23 +18,22 @@
  */
 package org.libreccm.ui.admin.imexport;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.libreccm.imexport.Exportable;
-import org.libreccm.imexport.ImportExport;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.concurrent.Future;
 
-import javax.ejb.AsyncResult;
-import javax.ejb.Asynchronous;
 import javax.ejb.Schedule;
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Event;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.persistence.EntityManager;
@@ -51,34 +50,47 @@ import javax.transaction.Transactional;
 @Named("ImportExportTaskManager")
 public class ImportExportTaskManager {
 
+    private static final Logger LOGGER = LogManager.getLogger(
+        ImportExportTaskManager.class
+    );
+
     @Inject
     private EntityManager entityManager;
 
     @Inject
-    private ImExportTasks imExportTasks;
+    private Event<ExportTask> exportTaskSender;
 
-    private SortedSet<ImExportTask> exportTasks;
+    @Inject
+    private Event<ImportTask> importTaskSender;
 
-    private SortedSet<ImExportTask> importTasks;
+//    @Inject
+//    private ImExportTasks imExportTasks;
+
+//    private SortedSet<ImExportTaskStatus> exportTasks;
+//
+//    private SortedSet<ImExportTaskStatus> importTasks;
+    private final SortedSet<ExportTaskStatus> exportTasks;
+
+    private final SortedSet<ImportTaskStatus> importTasks;
 
     public ImportExportTaskManager() {
         exportTasks = new TreeSet<>(
             Comparator.comparing(
-                ImExportTask::getStarted)
-                .thenComparing(ImExportTask::getName)
+                ExportTaskStatus::getStarted)
+                .thenComparing(ExportTaskStatus::getName)
         );
         importTasks = new TreeSet<>(
             Comparator.comparing(
-                ImExportTask::getStarted)
-                .thenComparing(ImExportTask::getName)
+                ImportTaskStatus::getStarted)
+                .thenComparing(ImportTaskStatus::getName)
         );
     }
 
-    public SortedSet<ImExportTask> getExportTasks() {
+    public SortedSet<ExportTaskStatus> getExportTasks() {
         return Collections.unmodifiableSortedSet(exportTasks);
     }
 
-    public SortedSet<ImExportTask> getImportTasks() {
+    public SortedSet<ImportTaskStatus> getImportTasks() {
         return Collections.unmodifiableSortedSet(importTasks);
     }
 
@@ -96,20 +108,24 @@ public class ImportExportTaskManager {
             entities.addAll(entitiesOfType);
         }
 
-        final ImExportTask task = new ImExportTask();
-        task.setName(exportName);
-        task.setStarted(LocalDateTime.now());
-        final Future<?> status = imExportTasks.startExport(
-            entities, exportName
-        );
-        task.setStatus(status);
-        exportTasks.add(task);
+        final ExportTaskStatus taskStatus = new ExportTaskStatus();
+        taskStatus.setName(exportName);
+        taskStatus.setStarted(LocalDateTime.now());
+//        final Future<?> status = imExportTasks.startExport(
+//            entities, exportName
+//        );
+        exportTaskSender.fireAsync(
+            new ExportTask(exportName, LocalDate.now(), entities, taskStatus)
+        ).handle((task , ex) -> handleExportTaskResult(task, ex, taskStatus));
+
+        taskStatus.setStatus(ImExportTaskStatusEnum.RUNNING);
+        exportTasks.add(taskStatus);
     }
 
 //    public void exportEntities(
 //        final Collection<Exportable> entities, final String exportName
 //    ) {
-//        final ImExportTask task = new ImExportTask();
+//        final ImExportTaskStatus task = new ImExportTaskStatus();
 //        task.setName(exportName);
 //        task.setStarted(LocalDate.now());
 //        final Future<?> status = startExport(entities, exportName);
@@ -117,21 +133,22 @@ public class ImportExportTaskManager {
 //        exportTasks.add(task);
 //    }
     public void importEntities(final String importName) {
-        final ImExportTask task = new ImExportTask();
-        task.setName(importName);
-        task.setStarted(LocalDateTime.now());
-        final Future<?> status = imExportTasks.startImport(importName);
-        task.setStatus(status);
-        importTasks.add(task);
+//        final ImExportTaskStatus task = new ImExportTaskStatus();
+//        task.setName(importName);
+//        task.setStarted(LocalDateTime.now());
+//        final Future<?> status = imExportTasks.startImport(importName);
+//        task.setStatus(status);
+//        importTasks.add(task);
+        throw new UnsupportedOperationException();
     }
 
     @Schedule(hour = "*", minute = "*/5", persistent = false)
     protected void removeFinishedTasks() {
-        exportTasks.removeIf(ImExportTask::isDone);
-        importTasks.removeIf(ImExportTask::isDone);
+        exportTasks.removeIf(taskStatus -> taskStatus.getStatus() == ImExportTaskStatusEnum.FINISHED);
+//        importTasks.removeIf(taskStatus -> taskStatus.getStatus() == ImExportTaskStatusEnum.FINISHED);
     }
 
-    public void cancelTask(final ImExportTask task) {
+    public void cancelTask(final ImExportTaskStatus task) {
         task.cancel();
     }
 
@@ -149,4 +166,18 @@ public class ImportExportTaskManager {
         );
     }
 
+    private Object handleExportTaskResult(
+        final ExportTask task, final Throwable ex, final ExportTaskStatus status
+    ) {
+        if (ex == null) {
+            status.setStatus(ImExportTaskStatusEnum.FINISHED);
+        } else {
+            status.setStatus(ImExportTaskStatusEnum.ERROR);
+            status.setException(ex);
+            LOGGER.error("Export Task {} failed ", task);
+            LOGGER.error("with exception:", ex);
+        }
+        return task;
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java
new file mode 100644
index 000000000..013c7406c
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.imexport;
+
+import java.time.LocalDate;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class ImportTask {
+
+    private final String name;
+
+    private final LocalDate started;
+
+    public ImportTask(final String name, final LocalDate started) {
+        this.name = name;
+        this.started = started;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public LocalDate getStarted() {
+        return started;
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
new file mode 100644
index 000000000..c67ecafb9
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.imexport;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.concurrent.CompletionStage;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
+
+    private String name;
+
+    private LocalDateTime started;
+
+    private CompletionStage<ImportTask> status;
+
+    public String getName() {
+        return name;
+    }
+
+    protected void setName(final String name) {
+        this.name = name;
+    }
+
+    public LocalDateTime getStarted() {
+        return started;
+    }
+
+    protected void setStarted(final LocalDateTime started) {
+        this.started = started;
+    }
+
+    public CompletionStage<ImportTask> getStatus() {
+        return status;
+    }
+
+    protected void setStatus(final CompletionStage<ImportTask> status) {
+        this.status = status;
+    }
+
+    public boolean canEqual(final Object obj) {
+        return obj instanceof ImExportTaskStatus;
+    }
+
+    @Override
+    public int compareTo(final ImportTaskStatus other) {
+        return Comparator
+            .nullsFirst(Comparator
+                .comparing(ImportTaskStatus::getName)
+                .thenComparing(ImportTaskStatus::getStarted)
+            )
+            .compare(this, other);
+    }
+
+    @Override
+    public String toString() {
+        return String.format(
+            "%s{ "
+                + "name = %s, "
+                + "started = %s, "
+                + "status = %s"
+                + " }",
+            super.toString(),
+            name,
+            DateTimeFormatter.ISO_DATE_TIME.withZone(
+                ZoneId.systemDefault()
+            ).format(started),
+            Objects.toString(status)
+        );
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationImExporter.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationImExporter.java
index 35038e547..cb2a296cd 100644
--- a/ccm-core/src/main/java/org/libreccm/web/ApplicationImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationImExporter.java
@@ -23,6 +23,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
@@ -50,14 +51,26 @@ public class ApplicationImExporter
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final CcmApplication entity) {
-
         applicationRepository.save(entity);
     }
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-
         return Collections.emptySet();
     }
 
+    @Override
+    protected CcmApplication reloadEntity(final CcmApplication entity) {
+        return applicationRepository
+            .findById(Objects.requireNonNull(entity).getObjectId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "CcmApplication entity %s not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskImExporter.java b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskImExporter.java
index 13f346ae1..a75311637 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskImExporter.java
@@ -23,6 +23,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
@@ -31,7 +32,7 @@ import javax.transaction.Transactional;
 
 /**
  * Exporter/Importer for {@link AssignableTask}s.
- * 
+ *
  * @author <a href="mailto:tosmers@uni-bremen.de">Tobias Osmers</a>
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  *
@@ -51,7 +52,6 @@ public class AssignableTaskImExporter
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-
         final Set<Class<? extends Exportable>> entities = new HashSet<>();
         entities.add(Workflow.class);
 
@@ -61,8 +61,21 @@ public class AssignableTaskImExporter
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final AssignableTask entity) {
-
         assignableTaskRepository.save(entity);
     }
 
+    @Override
+    protected AssignableTask reloadEntity(final AssignableTask entity) {
+        return assignableTaskRepository
+            .findById(Objects.requireNonNull(entity).getTaskId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "AssignableTask entity %s not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java
index 2e4092f45..16cb3f651 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java
@@ -37,17 +37,39 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
 /**
  * Represents the assignment of a {@link AssignableTask} to a {@link Role}.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Entity
 @Table(name = "WORKFLOW_TASK_ASSIGNMENTS", schema = DB_SCHEMA)
-@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
-                  property = "customAssignId")
+@NamedQueries({
+    @NamedQuery(
+        name = "TaskAssignment.findById",
+        query = "SELECT t FROM TaskAssignment t WHERE t.taskAssignmentId = :assignmentId"
+    ),
+    @NamedQuery(
+        name = "TaskAssignment.findByUuid",
+        query = "SELECT t FROM TaskAssignment t WHERE t.uuid = :uuid"
+    ),
+    @NamedQuery(
+        name = "TaskAssignment.findByTask",
+        query = "SELECT t FROM TaskAssignment t WHERE t.task = :task"
+    ),
+    @NamedQuery(
+        name = "TaskAssignment.findByRole",
+        query = "SELECT t FROM TaskAssignment t WHERE t.role = :role"
+    )
+})
+@JsonIdentityInfo(
+    generator = ObjectIdGenerators.PropertyGenerator.class,
+    property = "customAssignId"
+)
 public class TaskAssignment implements Serializable, Exportable {
 
     private static final long serialVersionUID = -4427537363301565707L;
@@ -62,7 +84,7 @@ public class TaskAssignment implements Serializable, Exportable {
 
     @Column(name = "UUID", unique = true, nullable = false)
     private String uuid;
-    
+
     /**
      * The task.
      */
@@ -86,7 +108,7 @@ public class TaskAssignment implements Serializable, Exportable {
     protected void setTaskAssignmentId(final long taskAssignmentId) {
         this.taskAssignmentId = taskAssignmentId;
     }
-    
+
     @Override
     public String getUuid() {
         return uuid;
@@ -95,7 +117,6 @@ public class TaskAssignment implements Serializable, Exportable {
     public void setUuid(final String uuid) {
         this.uuid = uuid;
     }
-    
 
     public AssignableTask getTask() {
         return task;
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentImExporter.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentImExporter.java
index f4bb4c704..7b685ed79 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentImExporter.java
@@ -23,22 +23,24 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 import javax.transaction.Transactional;
 
 /**
  * Exporter/Importer for {@link TaskAssignment}s.
- * 
+ *
  * @author <a href="mailto:tosmers@uni-bremen.de">Tobias Osmers</a>
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
 @Processes(TaskAssignment.class)
-public class TaskAssignmentImExporter 
+public class TaskAssignmentImExporter
     extends AbstractEntityImExporter<TaskAssignment> {
 
     @Inject
@@ -46,24 +48,44 @@ public class TaskAssignmentImExporter
 
     @Override
     public Class<TaskAssignment> getEntityClass() {
-
         return TaskAssignment.class;
     }
 
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final TaskAssignment entity) {
-        
         entityManager.persist(entity);
-        
+
     }
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-        
+
         final Set<Class<? extends Exportable>> classes = new HashSet<>();
         classes.add(AssignableTask.class);
-        
+
         return classes;
     }
+
+    @Override
+    protected TaskAssignment reloadEntity(final TaskAssignment entity) {
+        try {
+            return entityManager
+                .createNamedQuery(
+                    "TaskAssignment.findById", TaskAssignment.class
+                )
+                .setParameter(
+                    "assignmentId",
+                    Objects.requireNonNull(entity).getTaskAssignmentId()
+                ).getSingleResult();
+        } catch (NoResultException ex) {
+            throw new IllegalArgumentException(
+                String.format(
+                    "TaskAssignment entity %s not found in database.",
+                    Objects.toString(entity)
+                )
+            );
+        }
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentImExporter.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentImExporter.java
index 6ffe6a7c3..1a7d6d1d2 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskCommentImExporter.java
@@ -23,6 +23,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
@@ -55,12 +56,25 @@ public class TaskCommentImExporter extends AbstractEntityImExporter<TaskComment>
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-        
         final Set<Class<? extends Exportable>> classes = new HashSet<>();
         classes.add(AssignableTask.class);
         
         return classes;
     }
+
+    @Override
+    protected TaskComment reloadEntity(final TaskComment entity) {
+        return taskCommentRepository
+            .findById(Objects.requireNonNull(entity).getCommentId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "TaskComment entity %s not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
     
     
 }
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskDependency.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskDependency.java
index 2de740200..f5ac216b2 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/TaskDependency.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskDependency.java
@@ -34,6 +34,8 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
 /**
@@ -43,8 +45,28 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name = "WORKFLOW_TASK_DEPENDENCIES", schema = CoreConstants.DB_SCHEMA)
-@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class,
-                  property = "uuid")
+@NamedQueries({
+    @NamedQuery(
+        name = "TaskDependency.findById",
+        query = "SELECT d FROM TaskDependency d WHERE d.taskDependencyId = :dependencyId"
+    ),
+    @NamedQuery(
+        name = "TaskDependency.findByUuid",
+        query = "SELECT d FROM TaskDependency d WHERE d.uuid = :uuid"
+    ),
+    @NamedQuery(
+        name = "TaskDependency.findByBlockedTask",
+        query = "SELECT d FROM TaskDependency d WHERE d.blockedTask = :task"
+    ),
+    @NamedQuery(
+        name = "TaskDependency.findByBlockingTask",
+        query = "SELECT d FROM TaskDependency d WHERE d.blockingTask = :task"
+    )
+})
+@JsonIdentityInfo(
+    generator = ObjectIdGenerators.PropertyGenerator.class,
+                  property = "uuid"
+)
 public class TaskDependency implements Serializable, Exportable {
 
     private static final long serialVersionUID = -4383255770131633943L;
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyImExporter.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyImExporter.java
index 15293c412..128dce652 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskDependencyImExporter.java
@@ -23,22 +23,24 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 import javax.transaction.Transactional;
 
 /**
  * Exporter/Importer for {@link TaskDependency} entities.
- * 
+ *
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created the 12/12/17
  */
 @RequestScoped
 @Processes(TaskDependency.class)
-public class TaskDependencyImExporter 
+public class TaskDependencyImExporter
     extends AbstractEntityImExporter<TaskDependency> {
 
     @Inject
@@ -52,19 +54,36 @@ public class TaskDependencyImExporter
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final TaskDependency entity) {
-        
         entityManager.persist(entity);
     }
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-        
         final Set<Class<? extends Exportable>> classes = new HashSet<>();
         classes.add(AssignableTask.class);
-        
+
         return classes;
     }
 
-    
-    
+    @Override
+    protected TaskDependency reloadEntity(final TaskDependency entity) {
+        try {
+            return entityManager
+                .createNamedQuery(
+                    "TaskDependency.findById", TaskDependency.class
+                )
+                .setParameter(
+                    "dependencyId",
+                    Objects.requireNonNull(entity).getTaskDependencyId()
+                ).getSingleResult();
+        } catch (NoResultException ex) {
+            throw new IllegalArgumentException(
+                String.format(
+                    "TaskDependency entity %s not found in database.",
+                    Objects.toString(entity)
+                )
+            );
+        }
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowImExporter.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowImExporter.java
index de9549a1d..03b38bfc6 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowImExporter.java
@@ -23,6 +23,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
@@ -31,7 +32,7 @@ import javax.transaction.Transactional;
 
 /**
  * Importer/Exporter for {@link Workflow}s.
- * 
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
@@ -50,14 +51,26 @@ public class WorkflowImExporter extends AbstractEntityImExporter<Workflow> {
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
     protected void saveImportedEntity(final Workflow entity) {
-        
         workflowRepository.save(entity);
     }
 
     @Override
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
-
         return Collections.emptySet();
     }
 
+    @Override
+    protected Workflow reloadEntity(final Workflow entity) {
+        return workflowRepository
+            .findById(Objects.requireNonNull(entity).getWorkflowId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "Workflow entity %s not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
index 9f524b6e9..f5f43b9af 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/imexport.xhtml
@@ -88,20 +88,12 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <c:forEach items="#{ImportExportTaskManager.exportTasks}" var="task">
+                                    <c:forEach items="#{ImportExportTaskManager.exportTasks}" 
+                                               var="task">
                                         <tr>
                                             <td>#{task.name}</td>
                                             <td>#{task.started}</td>
-                                            <td>
-                                                <c:choose>
-                                                    <c:when test="#{task.done}">
-                                                        #{AdminMessages['imexport.activeexports.table.columns.status.finished']}
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        #{AdminMessages['imexport.activeexports.table.columns.status.running']}
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </td>
+                                            <td>#{task.status}</td>
                                             <td>
                                                 <a class="btn btn-warning" href="#">
                                                     #{AdminMessages['imexport.activeexports.table.columns.actions.button_label']}
@@ -135,7 +127,8 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <c:forEach items="#{ImportExportTaskManager.importTasks}" var="task">
+                                    <c:forEach items="#{ImportExportTaskManager.importTasks}" 
+                                               var="task">
                                         <tr>
                                             <td>#{task.name}</td>
                                             <td>#{task.started}</td>
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectImExporter.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectImExporter.java
index 2c83abcf2..8c2fc4082 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectImExporter.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectImExporter.java
@@ -23,9 +23,10 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
-import javax.faces.bean.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 
@@ -45,7 +46,7 @@ public class BlobObjectImExporter extends AbstractEntityImExporter<BlobObject> {
     private BlobObjectRepository blobObjectRepository;
 
     @Override
-    protected Class<BlobObject> getEntityClass() {
+    public Class<BlobObject> getEntityClass() {
         return BlobObject.class;
     }
 
@@ -61,4 +62,18 @@ public class BlobObjectImExporter extends AbstractEntityImExporter<BlobObject> {
         return Collections.emptySet();
     }
 
+    @Override
+    protected BlobObject reloadEntity(final BlobObject entity) {
+        return blobObjectRepository
+            .findById(Objects.requireNonNull(entity).getBlobObjectId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "BlobObject entity %s not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileImExporter.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileImExporter.java
index 09f6112a8..afe03f913 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileImExporter.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileImExporter.java
@@ -23,17 +23,17 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.enterprise.context.RequestScoped;
 
-
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 
 /**
- * Im/Exporter  for importing and exporting {@code File}s from the
- * system into a specified file and the other way around.
+ * Im/Exporter for importing and exporting {@code File}s from the system into a
+ * specified file and the other way around.
  *
  * @author <a href="mailto:tosmers@uni-bremen.de">Tobias Osmers</a>
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@@ -46,7 +46,7 @@ public class FileImExporter extends AbstractEntityImExporter<File> {
     private FileRepository fileRepository;
 
     @Override
-    protected Class<File> getEntityClass() {
+    public Class<File> getEntityClass() {
         return File.class;
     }
 
@@ -60,6 +60,19 @@ public class FileImExporter extends AbstractEntityImExporter<File> {
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
         return Collections.emptySet();
     }
-    
-    
+
+    @Override
+    protected File reloadEntity(final File entity) {
+        return fileRepository
+            .findById(Objects.requireNonNull(entity).getObjectId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "File entity %s not found in database",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderImExporter.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderImExporter.java
index b757b1eff..7645f8307 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderImExporter.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderImExporter.java
@@ -22,9 +22,10 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
-import javax.faces.bean.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 
@@ -43,7 +44,7 @@ public class FolderImExporter extends AbstractResourceImExporter<Folder> {
     private FolderRepository folderRepository;
 
     @Override
-    protected Class<Folder> getEntityClass() {
+    public Class<Folder> getEntityClass() {
         return Folder.class;
     }
 
@@ -58,4 +59,18 @@ public class FolderImExporter extends AbstractResourceImExporter<Folder> {
         return Collections.emptySet();
     }
 
+    @Override
+    protected Folder reloadEntity(final Folder entity) {
+        return folderRepository
+            .findById(Objects.requireNonNull(entity).getObjectId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "Folder entity %s not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryImExporter.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryImExporter.java
index bd2e03df2..c159f7ea9 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryImExporter.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryImExporter.java
@@ -23,9 +23,10 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.Processes;
 
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
-import javax.faces.bean.RequestScoped;
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 
 /**
@@ -40,7 +41,7 @@ public class RepositoryImExporter extends AbstractEntityImExporter<Repository> {
     private RepositoryRepository repositoryRepository;
 
     @Override
-    protected Class<Repository> getEntityClass() {
+    public Class<Repository> getEntityClass() {
         return Repository.class;
     }
 
@@ -53,7 +54,19 @@ public class RepositoryImExporter extends AbstractEntityImExporter<Repository> {
     protected Set<Class<? extends Exportable>> getRequiredEntities() {
         return Collections.emptySet();
     }
-    
-    
+
+    @Override
+    protected Repository reloadEntity(final Repository entity) {
+        return repositoryRepository
+            .findById(Objects.requireNonNull(entity).getObjectId())
+            .orElseThrow(
+                () -> new IllegalArgumentException(
+                    String.format(
+                        "Repository entity %s not found in database.",
+                        Objects.toString(entity)
+                    )
+                )
+            );
+    }
+
 }
-    
\ No newline at end of file

From 0b3d03cae636b46d3e6ab849469e680348dcd6f7 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 9 Dec 2020 20:19:39 +0100
Subject: [PATCH 91/93] UI for Import/Export of entities

---
 .../org/libreccm/imexport/ImportExport.java   | 44 +++++++++------
 .../org/libreccm/imexport/ImportManifest.java | 23 ++++++--
 .../ui/admin/imexport/ImExportController.java | 55 ++++++++++++++----
 .../ui/admin/imexport/ImExportTasks.java      | 25 +--------
 .../imexport/ImportExportTaskManager.java     | 47 +++++++---------
 .../ui/admin/imexport/ImportOption.java       | 56 +++++++++++++++++++
 .../ui/admin/imexport/ImportTask.java         | 13 ++++-
 .../ui/admin/imexport/ImportTaskStatus.java   | 52 +++++++++++++++--
 .../components/bootstrap/formGroupRadio.xhtml |  5 --
 .../ui/admin/imexport/exporting.xhtml         | 36 ------------
 .../libreccm/ui/admin/imexport/import.xhtml   | 51 +++++++++++++++++
 .../org/libreccm/ui/AdminBundle.properties    |  6 ++
 .../org/libreccm/ui/AdminBundle_de.properties |  6 ++
 13 files changed, 291 insertions(+), 128 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportOption.java
 delete mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/exporting.xhtml
 create mode 100644 ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/import.xhtml

diff --git a/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java b/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
index 1402b6a22..bb79e0d17 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/ImportExport.java
@@ -87,7 +87,7 @@ public class ImportExport {
                         .stream()
                         .collect(Collectors.toList())
                 );
-            
+
             return tree;
         } catch (DependencyException ex) {
             throw new UnexpectedErrorException(ex);
@@ -402,8 +402,9 @@ public class ImportExport {
 
     private ImportManifest createImportManifest(final String path) {
 
-        final String manifestPath = String.format("imports/%s/ccm-export.json",
-                                                  path);
+        final String manifestPath = String.format(
+            "imports/%s/ccm-export.json", path
+        );
 
         try (final InputStream inputStream = ccmFiles
             .createInputStream(manifestPath)) {
@@ -412,24 +413,33 @@ public class ImportExport {
             final JsonObject manifestJson = reader.readObject();
 
             if (!manifestJson.containsKey("created")) {
-                throw new IllegalArgumentException(String.format(
-                    "The manifest file \"%s\" is malformed. "
-                        + "Key \"created\" is missing.",
-                    manifestPath));
+                throw new IllegalArgumentException(
+                    String.format(
+                        "The manifest file \"%s\" is malformed. "
+                            + "Key \"created\" is missing.",
+                        manifestPath
+                    )
+                );
             }
 
             if (!manifestJson.containsKey("onServer")) {
-                throw new IllegalArgumentException(String.format(
-                    "The manifest file \"%s\" is malformed. "
-                        + "Key \"onServer\" is missing.",
-                    manifestPath));
+                throw new IllegalArgumentException(
+                    String.format(
+                        "The manifest file \"%s\" is malformed. "
+                            + "Key \"onServer\" is missing.",
+                        manifestPath
+                    )
+                );
             }
 
             if (!manifestJson.containsKey("types")) {
-                throw new IllegalArgumentException(String.format(
-                    "The manifest file \"%s\" is malformed. "
-                        + "Key \"types\" is missing.",
-                    manifestPath));
+                throw new IllegalArgumentException(
+                    String.format(
+                        "The manifest file \"%s\" is malformed. "
+                            + "Key \"types\" is missing.",
+                        manifestPath
+                    )
+                );
             }
 
             final LocalDateTime created = LocalDateTime
@@ -446,9 +456,11 @@ public class ImportExport {
             }
 
             return new ImportManifest(
+                path,
                 Date.from(created.atZone(ZoneId.of("UTC")).toInstant()),
                 onServer,
-                types);
+                types
+            );
         } catch (IOException
                  | FileAccessException
                  | FileDoesNotExistException
diff --git a/ccm-core/src/main/java/org/libreccm/imexport/ImportManifest.java b/ccm-core/src/main/java/org/libreccm/imexport/ImportManifest.java
index dbcf6fe66..05c12e78b 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/ImportManifest.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/ImportManifest.java
@@ -23,25 +23,36 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * Java class containg the properties of an parsed import manifest. 
- * 
+ * Java class containg the properties of an parsed import manifest.
+ *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class ImportManifest {
 
+    private final String importName;
+
     private final Date created;
+
     private final String onServer;
+
     private final List<String> types;
 
-    public ImportManifest(final Date created,
-                          final String onServer,
-                          final List<String> types) {
-
+    public ImportManifest(
+        final String importName,
+        final Date created,
+        final String onServer,
+        final List<String> types
+    ) {
+        this.importName = importName;
         this.created = created;
         this.onServer = onServer;
         this.types = types;
     }
 
+    public String getImportName() {
+        return importName;
+    }
+    
     public Date getCreated() {
         return new Date(created.getTime());
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
index faecb9f50..8d96f650c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
@@ -23,9 +23,12 @@ import org.libreccm.imexport.AbstractEntityImExporter;
 import org.libreccm.imexport.EntityImExporterTreeNode;
 import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.ImportExport;
+import org.libreccm.imexport.ImportManifest;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -129,15 +132,6 @@ public class ImExportController {
 
         taskManager.exportEntities(exportTypes, exportName);
 
-//        models.put(
-//            "exportEntities",
-//            exportNodes
-//                .stream()
-//                .map(node -> node.getEntityImExporter().getEntityClass().getName())
-//                .sorted()
-//                .collect(Collectors.joining("\n"))
-//        );
-//        return "org/libreccm/ui/admin/imexport/exporting.xhtml";
         return "redirect:imexport";
     }
 
@@ -146,7 +140,33 @@ public class ImExportController {
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     public String importEntities() {
-        throw new NotFoundException();
+        models.put(
+            "importArchives",
+            importExport
+                .listAvailableImportArchivies()
+                .stream()
+                .map(this::buildImportOption)
+                .sorted()
+                .collect(
+                    Collectors.toMap(
+                        ImportOption::getImportName,
+                        ImportOption::getLabel
+                    )
+                )
+        );
+        return "org/libreccm/ui/admin/imexport/import.xhtml";
+    }
+
+    @POST
+    @Path("/import")
+    @AuthorizationRequired
+    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
+    public String importEntities(
+        @FormParam("archive") final String importArchive
+    ) {
+        taskManager.importEntities(importArchive);
+
+        return "redirect:imexport";
     }
 
     private String noDuplicateKeys(final String str1, final String str2) {
@@ -176,4 +196,19 @@ public class ImExportController {
         }
     }
 
+    private ImportOption buildImportOption(final ImportManifest manifest) {
+        return new ImportOption(
+            manifest.getImportName(),
+            String.format(
+                "%s from server %s created on %s with types %s",
+                manifest.getImportName(),
+                manifest.getOnServer(),
+                DateTimeFormatter.ISO_DATE_TIME.withZone(
+                    ZoneOffset.systemDefault()
+                ).format(manifest.getCreated().toInstant()),
+                manifest.getTypes().stream().collect(Collectors.joining(", "))
+            )
+        );
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
index 51dc46149..87af6baed 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
@@ -22,14 +22,7 @@ import org.libreccm.imexport.Exportable;
 import org.libreccm.imexport.ImportExport;
 
 import java.util.Collection;
-import java.util.concurrent.Future;
 
-import javax.ejb.AsyncResult;
-import javax.ejb.Asynchronous;
-import javax.ejb.Singleton;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.ObservesAsync;
 import javax.inject.Inject;
@@ -45,22 +38,6 @@ public class ImExportTasks {
     @Inject
     private ImportExport importExport;
 
-//    @Asynchronous
-//    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-//    public Future<?> startExport(
-//        final Collection<Exportable> entities,
-//        final String exportName
-//    ) {
-//        importExport.exportEntities(entities, exportName);
-//        return new AsyncResult<>(null);
-//    }
-//
-//    @Asynchronous
-//    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
-//    public Future<?> startImport(final String importName) {
-//        importExport.importEntities(importName);
-//        return new AsyncResult<>(null);
-//    }
     
     @Transactional(Transactional.TxType.REQUIRED)
     public ExportTask exportEntities(@ObservesAsync final ExportTask task) {
@@ -73,7 +50,7 @@ public class ImExportTasks {
     }
     
     @Transactional(Transactional.TxType.REQUIRED)
-    public void importEntitites(@ObservesAsync final ImExportTaskStatus task) {
+    public void importEntitites(@ObservesAsync final ImportTask task) {
         final String importName = task.getName();
         
         importExport.importEntities(importName);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
index 2c5313815..0a88afe59 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
@@ -63,12 +63,6 @@ public class ImportExportTaskManager {
     @Inject
     private Event<ImportTask> importTaskSender;
 
-//    @Inject
-//    private ImExportTasks imExportTasks;
-
-//    private SortedSet<ImExportTaskStatus> exportTasks;
-//
-//    private SortedSet<ImExportTaskStatus> importTasks;
     private final SortedSet<ExportTaskStatus> exportTasks;
 
     private final SortedSet<ImportTaskStatus> importTasks;
@@ -111,9 +105,6 @@ public class ImportExportTaskManager {
         final ExportTaskStatus taskStatus = new ExportTaskStatus();
         taskStatus.setName(exportName);
         taskStatus.setStarted(LocalDateTime.now());
-//        final Future<?> status = imExportTasks.startExport(
-//            entities, exportName
-//        );
         exportTaskSender.fireAsync(
             new ExportTask(exportName, LocalDate.now(), entities, taskStatus)
         ).handle((task , ex) -> handleExportTaskResult(task, ex, taskStatus));
@@ -122,24 +113,15 @@ public class ImportExportTaskManager {
         exportTasks.add(taskStatus);
     }
 
-//    public void exportEntities(
-//        final Collection<Exportable> entities, final String exportName
-//    ) {
-//        final ImExportTaskStatus task = new ImExportTaskStatus();
-//        task.setName(exportName);
-//        task.setStarted(LocalDate.now());
-//        final Future<?> status = startExport(entities, exportName);
-//        task.setStatus(status);
-//        exportTasks.add(task);
-//    }
     public void importEntities(final String importName) {
-//        final ImExportTaskStatus task = new ImExportTaskStatus();
-//        task.setName(importName);
-//        task.setStarted(LocalDateTime.now());
-//        final Future<?> status = imExportTasks.startImport(importName);
-//        task.setStatus(status);
-//        importTasks.add(task);
-        throw new UnsupportedOperationException();
+        final ImportTaskStatus taskStatus = new ImportTaskStatus();
+        taskStatus.setStarted(LocalDateTime.now());
+        importTaskSender.fireAsync(
+            new ImportTask(importName, LocalDate.now(), taskStatus)
+        ).handle((task, ex) -> handleImportTaskResult(task, ex, taskStatus));
+        
+        taskStatus.setStatus(ImExportTaskStatusEnum.RUNNING);
+        importTasks.add(taskStatus);
     }
 
     @Schedule(hour = "*", minute = "*/5", persistent = false)
@@ -180,4 +162,17 @@ public class ImportExportTaskManager {
         return task;
     }
 
+    private Object handleImportTaskResult(
+        final ImportTask task, final Throwable ex, final ImportTaskStatus status
+    ) {
+        if (ex == null) {
+            status.setStatus(ImExportTaskStatusEnum.FINISHED);
+        } else {
+            status.setStatus(ImExportTaskStatusEnum.ERROR);
+            status.setException(ex);
+            LOGGER.error("Import Task {} failed", task);
+            LOGGER.error("with exception: ", ex);
+        }
+        return task;
+    }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportOption.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportOption.java
new file mode 100644
index 000000000..6ffee8514
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportOption.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.libreccm.ui.admin.imexport;
+
+import java.util.Objects;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class ImportOption implements Comparable<ImportOption> {
+
+    private final String importName;
+
+    private final String label;
+
+    public ImportOption(
+        final String importName,
+        final String label
+    ) {
+        this.importName = importName;
+        this.label = label;
+    }
+
+    public String getImportName() {
+        return importName;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    @Override
+    public int compareTo(final ImportOption other) {
+        return importName.compareTo(
+            Objects.requireNonNull(other).getImportName()
+        );
+    }
+
+}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java
index 013c7406c..2ea5bc252 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java
@@ -30,9 +30,16 @@ public class ImportTask {
 
     private final LocalDate started;
 
-    public ImportTask(final String name, final LocalDate started) {
+    private final ImportTaskStatus status;
+
+    public ImportTask(
+        final String name,
+        final LocalDate started,
+        final ImportTaskStatus status
+    ) {
         this.name = name;
         this.started = started;
+        this.status = status;
     }
 
     public String getName() {
@@ -43,4 +50,8 @@ public class ImportTask {
         return started;
     }
 
+    public ImportTaskStatus getStatus() {
+        return status;
+    }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
index c67ecafb9..b763d060b 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
@@ -23,7 +23,6 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Comparator;
 import java.util.Objects;
-import java.util.concurrent.CompletionStage;
 
 /**
  *
@@ -35,12 +34,15 @@ public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
 
     private LocalDateTime started;
 
-    private CompletionStage<ImportTask> status;
+    private ImExportTaskStatusEnum status;
+    
+    private Throwable exception;
 
     public String getName() {
         return name;
     }
 
+   
     protected void setName(final String name) {
         this.name = name;
     }
@@ -53,14 +55,56 @@ public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
         this.started = started;
     }
 
-    public CompletionStage<ImportTask> getStatus() {
+    public ImExportTaskStatusEnum getStatus() {
         return status;
     }
 
-    protected void setStatus(final CompletionStage<ImportTask> status) {
+    protected void setStatus(final ImExportTaskStatusEnum status) {
         this.status = status;
     }
+    
+        public Throwable getException() {
+        return exception;
+    }
 
+    protected void setException(final Throwable exception) {
+        this.exception = exception;
+    }
+
+     @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 53 * hash + Objects.hashCode(name);
+        hash = 53 * hash + Objects.hashCode(started);
+        hash = 53 * hash + Objects.hashCode(status);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof ImExportTaskStatus)) {
+            return false;
+        }
+        final ImportTaskStatus other = (ImportTaskStatus) obj;
+        if (!other.canEqual(this)) {
+            return false;
+        }
+        if (!Objects.equals(name, other.getName())) {
+            return false;
+        }
+        if (!Objects.equals(started, other.getStarted())) {
+            return false;
+        }
+        return status == other.getStatus();
+    }
+
+    
     public boolean canEqual(final Object obj) {
         return obj instanceof ImExportTaskStatus;
     }
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRadio.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRadio.xhtml
index 726371ec8..0b3717a1b 100644
--- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRadio.xhtml
+++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRadio.xhtml
@@ -3,11 +3,6 @@
       xmlns:cc="http://xmlns.jcp.org/jsf/composite"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
     <cc:interface shortDescription="Component for a single checkbox">
-        <cc:attribute default="false"
-                      name="checked"
-                      shortDescription="Is the checkbox selected?"
-                      required="false"
-                      type="boolean" />
         <cc:attribute name="help"
                       required="true"
                       shortDescription="A short description of the input field"
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/exporting.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/exporting.xhtml
deleted file mode 100644
index 2b5bdc8ee..000000000
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/exporting.xhtml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!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:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
-
-        <ui:param name="activePage" value="imexport" />
-        <ui:param name="title" value="#{AdminMessages['imexport.label']}" />
-
-        <ui:define name="breadcrumb">
-            <li class="breadcrumb-item">
-                <a href="#{mvc.uri('ImExportController#getImExportDashboard')}">
-                    #{AdminMessages['imexport.label']}
-                </a>
-            </li>
-            <li class="breadcrumb-item active">
-                #{AdminMessages['imexport.export.label']}
-            </li>
-
-        </ui:define>
-
-        <ui:define name="main">
-            <div class="container">
-                <h1>#{AdminMessages['imexport.export.label']}</h1>
-
-                <pre>#{exportEntities}</pre>
-            </div>
-        </ui:define>
-
-    </ui:composition>
-</html>
-
-
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/import.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/import.xhtml
new file mode 100644
index 000000000..af59ec114
--- /dev/null
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/imexport/import.xhtml
@@ -0,0 +1,51 @@
+<!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:libreccm="http://xmlns.jcp.org/jsf/composite/components/libreccm"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
+
+        <ui:param name="activePage" value="imexport" />
+        <ui:param name="title" value="#{AdminMessages['imexport.label']}" />
+
+        <ui:define name="breadcrumb">
+            <li class="breadcrumb-item">
+                <a href="#{mvc.uri('ImExportController#getImExportDashboard')}">
+                    #{AdminMessages['imexport.label']}
+                </a>
+            </li>
+            <li class="breadcrumb-item active">
+                #{AdminMessages['imexport.import.label']}
+            </li>
+
+        </ui:define>
+
+        <ui:define name="main">
+            <div class="container">
+                <h1>#{AdminMessages['imexport.import.label']}</h1>
+
+                <form action="#{mvc.uri('ImExportController#importEntities')}"
+                      aria-described="import-help"
+                      method="post">
+                    <p id="import-help">#{AdminMessages['imexport.import.help']}</p>
+
+                    <bootstrap:formGroupRadio help="#{AdminMessages['imexport.import.archives.help']}"
+                                              inputId="importarchives"
+                                              label="#{AdminMessages['imexport.import.archives.label']}"
+                                              name="archive"
+                                              options="#{importArchives}" />
+                    <a class="btn btn-warning"
+                       href="#{mvc.uri('ImExportController#getImExportDashboard')}">
+                        #{AdminMessages['imexport.import.cancel']}
+                    </a>
+                    <button class="btn btn-success" type="submit">
+                        #{AdminMessages['imexport.import.submit']}
+                    </button>
+                </form>
+            </div>
+        </ui:define>
+
+    </ui:composition>
+</html>
\ No newline at end of file
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index 2de1c0183..bd66256dd 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -556,3 +556,9 @@ imexport.activeimports.table.columns.actions.heading=Actions
 imexport.activeimports.table.columns.status.finished=Finished
 imexport.activeimports.table.columns.status.running=In progress
 imexport.activeimports.table.columns.actions.button_label=Cancel
+imexport.import.label=Import
+imexport.import.help=Select one of the available import archives
+imexport.import.archives.help=Select the archive to import
+imexport.import.archives.label=Available import archives
+imexport.import.cancel=Cancel
+imexport.import.submit=Start Import
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 79c56bf03..c8e8a1711 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -556,3 +556,9 @@ imexport.activeimports.table.columns.actions.heading=Aktionen
 imexport.activeimports.table.columns.status.finished=Abgeschlossen
 imexport.activeimports.table.columns.status.running=In Arbeit
 imexport.activeimports.table.columns.actions.button_label=Abbrechen
+imexport.import.label=Import
+imexport.import.help=W\u00e4hlen Sie das zu importierende Archiv
+imexport.import.archives.help=W\u00e4hlen Sie das zu importierende Archiv
+imexport.import.archives.label=Verf\u00fcgbare Import-Archive
+imexport.import.cancel=Abbrechen
+imexport.import.submit=Import starten

From 36bba3b9dc6d569adcbb6d886be2efa20cb44559 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 9 Dec 2020 20:26:03 +0100
Subject: [PATCH 92/93] Code cleanup

---
 .../ui/admin/imexport/ExportTaskStatus.java   |   8 +-
 .../ui/admin/imexport/ImExportTaskStatus.java | 115 +-----------------
 .../imexport/ImExportTaskStatusEnum.java      |  31 -----
 .../ui/admin/imexport/ImExportTasks.java      |   2 +-
 .../imexport/ImportExportTaskManager.java     |  21 ++--
 .../ui/admin/imexport/ImportTaskStatus.java   |  10 +-
 6 files changed, 23 insertions(+), 164 deletions(-)
 delete mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatusEnum.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java
index 9b49f1bc8..2e63bbd16 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java
@@ -34,7 +34,7 @@ public class ExportTaskStatus implements Comparable<ExportTaskStatus> {
 
     private LocalDateTime started;
 
-    private ImExportTaskStatusEnum status;
+    private ImExportTaskStatus status;
 
     private Throwable exception;
 
@@ -54,11 +54,11 @@ public class ExportTaskStatus implements Comparable<ExportTaskStatus> {
         this.started = started;
     }
 
-    public ImExportTaskStatusEnum getStatus() {
+    public ImExportTaskStatus getStatus() {
         return status;
     }
 
-    protected void setStatus(final ImExportTaskStatusEnum status) {
+    protected void setStatus(final ImExportTaskStatus status) {
         this.status = status;
     }
 
@@ -104,7 +104,7 @@ public class ExportTaskStatus implements Comparable<ExportTaskStatus> {
     }
 
     public boolean canEqual(final Object obj) {
-        return obj instanceof ImExportTaskStatus;
+        return obj instanceof ExportTaskStatus;
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatus.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatus.java
index 1601aebe7..1e127b578 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatus.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatus.java
@@ -18,121 +18,14 @@
  */
 package org.libreccm.ui.admin.imexport;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.Comparator;
-import java.util.Objects;
-import java.util.concurrent.Future;
-
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class ImExportTaskStatus implements Comparable<ImExportTaskStatus> {
+public enum ImExportTaskStatus {
 
-    private String name;
-
-    private LocalDateTime started;
-
-    private Future<?> status;
-
-    public String getName() {
-        return name;
-    }
-
-    protected void setName(final String name) {
-        this.name = name;
-    }
-
-    public LocalDateTime getStarted() {
-        return started;
-    }
-
-    public String getStartedAsIso() {
-        return DateTimeFormatter.ISO_DATE_TIME.withZone(
-            ZoneId.systemDefault()).format(started
-        );
-    }
-
-    protected void setStarted(final LocalDateTime started) {
-        this.started = started;
-    }
-
-    public Future<?> getStatus() {
-        return status;
-    }
-
-    protected void setStatus(final Future<?> status) {
-        this.status = status;
-    }
-
-    public boolean isDone() {
-        return status.isDone();
-    }
-
-    protected void cancel() {
-        status.cancel(true);
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 23 * hash + Objects.hashCode(this.name);
-        hash = 23 * hash + Objects.hashCode(this.started);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof ImExportTaskStatus)) {
-            return false;
-        }
-        final ImExportTaskStatus other = (ImExportTaskStatus) obj;
-        if (!other.canEqual(this)) {
-            return false;
-        }
-        if (!Objects.equals(this.name, other.getName())) {
-            return false;
-        }
-        return Objects.equals(this.started, other.getStarted());
-    }
-
-    public boolean canEqual(final Object obj) {
-        return obj instanceof ImExportTaskStatus;
-    }
-
-    @Override
-    public int compareTo(final ImExportTaskStatus other) {
-        return Comparator
-            .nullsFirst(Comparator
-                .comparing(ImExportTaskStatus::getName)
-                .thenComparing(ImExportTaskStatus::getStarted)
-            )
-            .compare(this, other);
-    }
-
-    @Override
-    public String toString() {
-        return String.format(
-            "%s{ "
-                + "name = %s, "
-                + "started = %s, "
-                + "status = %s"
-                + " }",
-            super.toString(),
-            name,
-            DateTimeFormatter.ISO_DATE_TIME.withZone(
-                ZoneId.systemDefault()
-            ).format(started),
-            Objects.toString(status)
-        );
-    }
+    ERROR,
+    FINISHED,
+    RUNNING,
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatusEnum.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatusEnum.java
deleted file mode 100644
index 2d4889445..000000000
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatusEnum.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2020 LibreCCM Foundation.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301  USA
- */
-package org.libreccm.ui.admin.imexport;
-
-/**
- *
- * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
- */
-public enum ImExportTaskStatusEnum {
-
-    ERROR,
-    FINISHED,
-    RUNNING,
-
-}
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
index 87af6baed..1804a5c59 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
@@ -45,7 +45,7 @@ public class ImExportTasks {
         final String exportName = task.getName();
         
         importExport.exportEntities(entities, exportName);
-        task.getStatus().setStatus(ImExportTaskStatusEnum.FINISHED);
+        task.getStatus().setStatus(ImExportTaskStatus.FINISHED);
         return task;
     }
     
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
index 0a88afe59..b9bd1e56c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
@@ -109,7 +109,7 @@ public class ImportExportTaskManager {
             new ExportTask(exportName, LocalDate.now(), entities, taskStatus)
         ).handle((task , ex) -> handleExportTaskResult(task, ex, taskStatus));
 
-        taskStatus.setStatus(ImExportTaskStatusEnum.RUNNING);
+        taskStatus.setStatus(ImExportTaskStatus.RUNNING);
         exportTasks.add(taskStatus);
     }
 
@@ -120,20 +120,17 @@ public class ImportExportTaskManager {
             new ImportTask(importName, LocalDate.now(), taskStatus)
         ).handle((task, ex) -> handleImportTaskResult(task, ex, taskStatus));
         
-        taskStatus.setStatus(ImExportTaskStatusEnum.RUNNING);
+        taskStatus.setStatus(ImExportTaskStatus.RUNNING);
         importTasks.add(taskStatus);
     }
 
     @Schedule(hour = "*", minute = "*/5", persistent = false)
     protected void removeFinishedTasks() {
-        exportTasks.removeIf(taskStatus -> taskStatus.getStatus() == ImExportTaskStatusEnum.FINISHED);
-//        importTasks.removeIf(taskStatus -> taskStatus.getStatus() == ImExportTaskStatusEnum.FINISHED);
-    }
-
-    public void cancelTask(final ImExportTaskStatus task) {
-        task.cancel();
+        exportTasks.removeIf(taskStatus -> taskStatus.getStatus() == ImExportTaskStatus.FINISHED);
+//        importTasks.removeIf(taskStatus -> taskStatus.getStatus() == ImExportTaskStatus.FINISHED);
     }
 
+    
     private Set<? extends Exportable> collectEntities(
         final Class<Exportable> ofType
     ) {
@@ -152,9 +149,9 @@ public class ImportExportTaskManager {
         final ExportTask task, final Throwable ex, final ExportTaskStatus status
     ) {
         if (ex == null) {
-            status.setStatus(ImExportTaskStatusEnum.FINISHED);
+            status.setStatus(ImExportTaskStatus.FINISHED);
         } else {
-            status.setStatus(ImExportTaskStatusEnum.ERROR);
+            status.setStatus(ImExportTaskStatus.ERROR);
             status.setException(ex);
             LOGGER.error("Export Task {} failed ", task);
             LOGGER.error("with exception:", ex);
@@ -166,9 +163,9 @@ public class ImportExportTaskManager {
         final ImportTask task, final Throwable ex, final ImportTaskStatus status
     ) {
         if (ex == null) {
-            status.setStatus(ImExportTaskStatusEnum.FINISHED);
+            status.setStatus(ImExportTaskStatus.FINISHED);
         } else {
-            status.setStatus(ImExportTaskStatusEnum.ERROR);
+            status.setStatus(ImExportTaskStatus.ERROR);
             status.setException(ex);
             LOGGER.error("Import Task {} failed", task);
             LOGGER.error("with exception: ", ex);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
index b763d060b..8ec1ea92b 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
@@ -34,7 +34,7 @@ public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
 
     private LocalDateTime started;
 
-    private ImExportTaskStatusEnum status;
+    private ImExportTaskStatus status;
     
     private Throwable exception;
 
@@ -55,11 +55,11 @@ public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
         this.started = started;
     }
 
-    public ImExportTaskStatusEnum getStatus() {
+    public ImExportTaskStatus getStatus() {
         return status;
     }
 
-    protected void setStatus(final ImExportTaskStatusEnum status) {
+    protected void setStatus(final ImExportTaskStatus status) {
         this.status = status;
     }
     
@@ -88,7 +88,7 @@ public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
         if (obj == null) {
             return false;
         }
-        if (!(obj instanceof ImExportTaskStatus)) {
+        if (!(obj instanceof ExportTaskStatus)) {
             return false;
         }
         final ImportTaskStatus other = (ImportTaskStatus) obj;
@@ -106,7 +106,7 @@ public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
 
     
     public boolean canEqual(final Object obj) {
-        return obj instanceof ImExportTaskStatus;
+        return obj instanceof ImportTaskStatus;
     }
 
     @Override

From 209ca41e5e6d0a871daa8531dc728c2ae73347d0 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 10 Dec 2020 15:28:12 +0100
Subject: [PATCH 93/93] JavaDoc for Admin UI

---
 .../applications/ApplicationController.java   |   4 +-
 .../applications/ApplicationTypeInfoItem.java |  29 ++++-
 .../applications/ApplicationsController.java  |  32 +++--
 .../admin/applications/ApplicationsPage.java  |   5 +-
 .../DefaultApplicationController.java         |   4 +
 .../ui/admin/applications/package-info.java   |  22 ++++
 .../categories/CategoriesController.java      | 107 ++++++++++++++++-
 .../ui/admin/categories/CategoriesPage.java   |   4 +-
 .../categories/CategoryDetailsModel.java      |   8 +-
 .../categories/CategoryFormController.java    |  22 +++-
 .../admin/categories/CategoryNodeModel.java   |   3 +-
 .../admin/categories/CategoryPathModel.java   |   3 +-
 .../CategorySystemDetailsModel.java           |   9 +-
 .../CategorySystemFormController.java         |  25 ++++
 .../categories/CategorySystemOwnerOption.java |   3 +-
 .../categories/CategorySystemOwnerRow.java    |   3 +-
 .../categories/CategorySystemTableRow.java    |   3 +-
 .../categories/CategorySystemsController.java | 113 ++++++++++++++++--
 .../categories/CategorySystemsTableModel.java |  22 ++++
 .../ui/admin/categories/DomainNodeModel.java  |   7 +-
 .../ui/admin/categories/package-info.java     |  22 ++++
 .../ConfigurationController.java              |  22 +++-
 .../configuration/ConfigurationPage.java      |   8 +-
 .../ConfigurationTableEntry.java              |   3 +-
 .../configuration/SettingsController.java     |  16 ++-
 .../configuration/SettingsTableEntry.java     |   3 +-
 .../ui/admin/configuration/package-info.java  |  22 ++++
 .../admin/dashboard/DashboardController.java  |   8 +-
 .../ui/admin/dashboard/DashboardPage.java     |   8 +-
 .../ui/admin/dashboard/package-info.java      |  22 ++++
 .../ui/admin/imexport/ExportTask.java         |  15 ++-
 .../ui/admin/imexport/ExportTaskStatus.java   |  15 ++-
 .../ui/admin/imexport/ImExportController.java |  69 ++++++++++-
 .../ui/admin/imexport/ImExportPage.java       |   3 +-
 .../ui/admin/imexport/ImExportTaskStatus.java |  12 +-
 .../ui/admin/imexport/ImExportTasks.java      |  22 +++-
 .../imexport/ImportExportTaskManager.java     |  87 +++++++++++++-
 .../ui/admin/imexport/ImportOption.java       |  10 ++
 .../ui/admin/imexport/ImportTask.java         |  10 ++
 .../ui/admin/imexport/ImportTaskStatus.java   |  23 +++-
 .../ui/admin/imexport/package-info.java       |  22 ++++
 .../ui/admin/sites/SiteDetailsModel.java      |   8 +-
 .../ui/admin/sites/SiteFormController.java    |  16 +++
 .../libreccm/ui/admin/sites/SiteTableRow.java |   3 +-
 .../ui/admin/sites/SitesController.java       |  82 +++++++++----
 .../libreccm/ui/admin/sites/SitesPage.java    |   3 +-
 .../libreccm/ui/admin/sites/package-info.java |  22 ++++
 .../SystemInformationController.java          |  13 +-
 .../SystemInformationModel.java               |  13 ++
 .../SystemInformationPage.java                |   3 +-
 .../admin/systeminformation/package-info.java |  22 ++++
 .../ui/admin/themes/ThemesController.java     |  58 ++++++---
 .../libreccm/ui/admin/themes/ThemesModel.java |  23 +++-
 .../libreccm/ui/admin/themes/ThemesPage.java  |   3 +-
 .../ui/admin/themes/ThemesTableRow.java       |   1 +
 .../ui/admin/themes/package-info.java         |  22 ++++
 56 files changed, 1016 insertions(+), 126 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/applications/package-info.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/categories/package-info.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/configuration/package-info.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/package-info.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/imexport/package-info.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/sites/package-info.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/package-info.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/ui/admin/themes/package-info.java

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java
index 798f71912..3a7cacf61 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationController.java
@@ -19,7 +19,9 @@
 package org.libreccm.ui.admin.applications;
 
 /**
- *
+ * Interface for controllers providing the UI for managing the instances of 
+ * an application.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public interface ApplicationController {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
index 862171648..2baa272ae 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationTypeInfoItem.java
@@ -21,22 +21,45 @@ package org.libreccm.ui.admin.applications;
 import java.util.Objects;
 
 /**
+ * Data Transfer Object providing the information about an application. Used for
+ * rendering the informations the available applications in UI.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class ApplicationTypeInfoItem implements
     Comparable<ApplicationTypeInfoItem> {
 
+    /**
+     * Name of the application.
+     */
     private String name;
 
+    /**
+     * Localized title of the application, if available in the language of the
+     * current user.
+     */
     private String title;
 
+    /**
+     * Localized title of the application, if available in the language of the
+     * current user.
+     */
     private String description;
 
+    /**
+     * Is the application a singleton application?
+     */
     private boolean singleton;
 
+    /**
+     * Number of existing instances of the application.
+     */
     private long numberOfInstances;
-       
+
+    /**
+     * Link the {@link ApplicationController} implementation of the application,
+     * if an implementation is available.
+     */
     private String controllerLink;
 
     protected ApplicationTypeInfoItem() {
@@ -82,11 +105,11 @@ public class ApplicationTypeInfoItem implements
     protected void setNumberOfInstances(final long numberOfInstances) {
         this.numberOfInstances = numberOfInstances;
     }
-    
+
     public String getControllerLink() {
         return controllerLink;
     }
-    
+
     protected void setControllerLink(final String controllerLink) {
         this.controllerLink = controllerLink;
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
index 8a5f4200f..4c62faf24 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsController.java
@@ -40,6 +40,7 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
 /**
+ * Controller for the UI for managing application instances.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -60,9 +61,13 @@ public class ApplicationsController {
     @Inject
     private Models models;
 
-//    @Inject
-//    private MvcContext mvc;
-
+    /**
+     * Retrives the avaiable application types, creates
+     * {@link ApplicationTypeInfoItem}s for them and makes them available using
+     * {@link #models}.
+     *
+     * @return The template to render.
+     */
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -83,6 +88,15 @@ public class ApplicationsController {
         return "org/libreccm/ui/admin/applications/applicationtypes.xhtml";
     }
 
+    /**
+     * Helper method for building an {@link ApplicationTypeInfoItem} for an
+     * {@link ApplicationType}.
+     *
+     * @param applicationType The application type.
+     *
+     * @return An {@link ApplicationTypeInfoItem} for the provided application
+     *         type.
+     */
     private ApplicationTypeInfoItem buildTypeInfoItem(
         final ApplicationType applicationType
     ) {
@@ -101,15 +115,9 @@ public class ApplicationsController {
         final Class<? extends ApplicationController> controllerClass
             = applicationType.applicationController();
 
-        if (!DefaultApplicationController.class
-            .isAssignableFrom(controllerClass)) {
-//            item.setControllerLink(
-//                mvc.uri(
-//                    String.format(
-//                        "%s#getApplication", controllerClass.getSimpleName()
-//                    )
-//                ).toString()
-//            );
+        if (!DefaultApplicationController.class.isAssignableFrom(
+            controllerClass
+        )) {
             item.setControllerLink(
                 String.format(
                     "%s#getApplication",
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
index 499a14483..f59dd840a 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/ApplicationsPage.java
@@ -18,8 +18,6 @@
  */
 package org.libreccm.ui.admin.applications;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.libreccm.ui.admin.AdminConstants;
 import org.libreccm.ui.admin.AdminPage;
 import org.libreccm.web.ApplicationManager;
@@ -32,7 +30,8 @@ import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
 /**
- *
+ * {@link AdminPage} for managing applications.
+ *  
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @ApplicationScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java
index 126ed7f15..56a11f0b3 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/DefaultApplicationController.java
@@ -23,6 +23,10 @@ import javax.mvc.Controller;
 import javax.ws.rs.Path;
 
 /**
+ * A default implementation of the {@link ApplicationController} used if there
+ * is not implementation of the {@link ApplicationController} interface for an
+ * application.
+ *
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/applications/package-info.java b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/package-info.java
new file mode 100644
index 000000000..f8a9d5a4e
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/applications/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/**
+ * UI for managing application instances.
+ */
+package org.libreccm.ui.admin.applications;
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
index b970811af..1c948edbe 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java
@@ -50,6 +50,7 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.core.MediaType;
 
 /**
+ * Primary controller for the UI for managing category systems and categories.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -72,13 +73,20 @@ public class CategoriesController {
 
     @Inject
     private DomainRepository domainRepository;
-    
+
     @Inject
     private IdentifierParser identifierParser;
 
     @Inject
     private Models models;
 
+    /**
+     * Show details about a category.
+     *
+     * @param categoryIdentifier Identifier of the category to show.
+     *
+     * @return The template to render.
+     */
     @GET
     @Path("/{categoryIdentifier}")
     @AuthorizationRequired
@@ -120,6 +128,13 @@ public class CategoriesController {
         }
     }
 
+    /**
+     * Show the edit form for a category.
+     *
+     * @param categoryIdentifier Identifier of the category to edit.
+     *
+     * @return The template to render.
+     */
     @GET
     @Path("/{categoryIdentifier}/edit")
     @AuthorizationRequired
@@ -161,6 +176,13 @@ public class CategoriesController {
         }
     }
 
+    /**
+     * Displays the form for creating a new subcategory.
+     *
+     * @param categoryIdentifier The identifier of the parent category.
+     *
+     * @return The template to render.
+     */
     @GET
     @Path("/{categoryIdentifier}/subcategories/new")
     @AuthorizationRequired
@@ -202,6 +224,15 @@ public class CategoriesController {
         }
     }
 
+    /**
+     * Moves a category from one parent category to another. The target is
+     * provided
+     *
+     * @param categoryIdentifierParam Identifier of the category to move.
+     * @param targetIdentifierParam   Identifier of the target category.
+     *
+     * @return Redirect to the detail page of the target category.
+     */
     @POST
     @Path("/{categoryIdentifier}/subcategories/move")
     @AuthorizationRequired
@@ -286,6 +317,14 @@ public class CategoriesController {
         );
     }
 
+    /**
+     * Deletes a category.
+     *
+     * @param categoryIdentifier Identifier of the category to remove.
+     *
+     * @return Redirect to the details page of the parent category of the
+     *         removed category.
+     */
     @POST
     @Path("/{categoryIdentifier}/subcategories/remove")
     @AuthorizationRequired
@@ -341,6 +380,15 @@ public class CategoriesController {
         }
     }
 
+    /**
+     * Adds a localized title the a category.
+     *
+     * @param identifierParam Identifier of the category.
+     * @param localeParam     The locale of the title.
+     * @param value           The localized title.
+     *
+     * @return Redirect to the details page of the category.
+     */
     @POST
     @Path("/{identifier}/title/add")
     @AuthorizationRequired
@@ -390,6 +438,15 @@ public class CategoriesController {
         }
     }
 
+    /**
+     * Updates the localized title of a category.
+     *
+     * @param identifierParam Identifier of the category.
+     * @param localeParam     The locale of the title.
+     * @param value           The localized title.
+     *
+     * @return Redirect to the details page of the category.
+     */
     @POST
     @Path("/{identifier}/title/{locale}/edit")
     @AuthorizationRequired
@@ -439,6 +496,14 @@ public class CategoriesController {
         }
     }
 
+    /**
+     * Removes the localized title of a category.
+     *
+     * @param categoryIdentifierParam Identifier of the category.
+     * @param localeParam             The locale of the title.
+     *
+     * @return Redirect to the details page of the category.
+     */
     @POST
     @Path("/{identifier}/title/{locale}/remove")
     @AuthorizationRequired
@@ -488,6 +553,15 @@ public class CategoriesController {
         }
     }
 
+    /**
+     * Adds a localized description the a category.
+     *
+     * @param identifierParam Identifier of the category.
+     * @param localeParam     The locale of the description
+     * @param value           The localized description.
+     *
+     * @return Redirect to the details page of the category.
+     */
     @POST
     @Path("/{identifier}decsription/add")
     @AuthorizationRequired
@@ -537,6 +611,15 @@ public class CategoriesController {
         }
     }
 
+    /**
+     * Updates the localized description the a category.
+     *
+     * @param identifierParam Identifier of the category.
+     * @param localeParam     The locale of the description
+     * @param value           The localized description.
+     *
+     * @return Redirect to the details page of the category.
+     */
     @POST
     @Path("/{identifier}/description/{locale}/edit")
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@@ -587,6 +670,14 @@ public class CategoriesController {
         }
     }
 
+    /**
+     * Removes a localized description the a category.
+     *
+     * @param identifierParam Identifier of the category.
+     * @param localeParam     The locale of the description
+     *
+     * @return Redirect to the details page of the category.
+     */
     @POST
     @Path("/{identifier}/description/{locale}/remove")
     @AuthorizationRequired
@@ -635,6 +726,16 @@ public class CategoriesController {
         }
     }
 
+    /**
+     * Changes the order of the subcategories of a category.
+     *
+     * @param categoryIdentifierParam    Identifier of the category.
+     * @param subCategoryIdentifierParam Identifier of the sub category to move.
+     * @param direction                  The direction, either
+     *                                   {@code INCREASE or DECREASE}.
+     *
+     * @return Redirect to the details page of the category.
+     */
     @POST
     @Path("/{categoryIdentifier}/subcategories/{subCategoryIdentifier}/reorder")
     @AuthorizationRequired
@@ -724,7 +825,7 @@ public class CategoriesController {
                     )
                 );
         }
-        
+
         if (category.getParentCategory() == null) {
             final Optional<Domain> categorySystem = domainRepository
                 .findByRootCategory(category);
@@ -735,7 +836,7 @@ public class CategoriesController {
                 );
             } else {
                 return String.format(
-                    "redirect:categorymanager/categories/ID-%d", 
+                    "redirect:categorymanager/categories/ID-%d",
                     category.getObjectId()
                 );
             }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
index 7313df8ca..d4594658d 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesPage.java
@@ -27,7 +27,9 @@ import java.util.Set;
 import javax.enterprise.context.ApplicationScoped;
 
 /**
- *
+ * {@link AdminPage} implementation for the UI for managing categories. 
+ * 
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @ApplicationScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
index c34a21867..6ada58e99 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryDetailsModel.java
@@ -42,7 +42,8 @@ import javax.inject.Named;
 import javax.transaction.Transactional;
 
 /**
- *
+ * Model for the details of a category.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
@@ -202,6 +203,11 @@ public class CategoryDetailsModel {
         this.invalidFields = new HashSet<>(invalidFields);
     }
 
+    /**
+     * Sets the model to the properties of the provided category.
+     * 
+     * @param category The category.
+     */
     @Transactional(Transactional.TxType.REQUIRED)
     protected void setCategory(final Category category) {
         Objects.requireNonNull(category);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
index 7582cca52..3ff5219bb 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryFormController.java
@@ -45,6 +45,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
+ * Controller processing the POST requests from the form for creating and
+ * editing categories.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -67,7 +69,7 @@ public class CategoryFormController {
 
     @Inject
     private DomainRepository domainRepository;
-    
+
     @Inject
     private IdentifierParser identifierParser;
 
@@ -86,6 +88,12 @@ public class CategoryFormController {
     @FormParam("abstractCategory")
     private String abstractCategory;
 
+    /**
+     * Create a new category.
+     * 
+     * @param parentCategoryIdentifier Identifier of the parent category.
+     * @return Redirect to the details page of the parent category.
+     */
     @POST
     @Path("/{parentCategoryIdentifier}/new")
     @AuthorizationRequired
@@ -135,9 +143,9 @@ public class CategoryFormController {
                     );
                 } else {
                     return String.format(
-                    "redirect:categorymanager/categories/ID-%d",
-                    parentCategory.getObjectId()
-                );
+                        "redirect:categorymanager/categories/ID-%d",
+                        parentCategory.getObjectId()
+                    );
                 }
             } else {
                 return String.format(
@@ -158,6 +166,12 @@ public class CategoryFormController {
         }
     }
 
+    /**
+     * Updates a category with the data from the form.
+     * 
+     * @param categoryIdentifierParam Identifier of the category to update.
+     * @return Redirect to the details page of the category.
+     */
     @POST
     @Path("/{categoryIdentifier}/edit")
     @AuthorizationRequired
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
index 3ff21db32..d915b3426 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryNodeModel.java
@@ -21,7 +21,8 @@ package org.libreccm.ui.admin.categories;
 import java.util.Objects;
 
 /**
- *
+ * A DTO with the of a category shown in the UI.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class CategoryNodeModel implements Comparable<CategoryNodeModel> {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryPathModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryPathModel.java
index 181bb8ea1..c50c2df55 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryPathModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoryPathModel.java
@@ -23,7 +23,8 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- *
+ * Model for displaying the path of category in the UI.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class CategoryPathModel {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
index 9dbc13ed9..2c136f59f 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemDetailsModel.java
@@ -46,7 +46,10 @@ import javax.inject.Named;
 import javax.transaction.Transactional;
 
 /**
- *
+ * Model for the details of a category system (Domain)
+ * 
+ * @see org.libreccm.categorization.Domain
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
@@ -227,6 +230,10 @@ public class CategorySystemDetailsModel {
         this.invalidFields = new HashSet<>(invalidFields);
     }
 
+    /**
+     * Sets the properties of this model using the provided {@link Domain}.
+     * @param domain The domain to display.
+     */
     @Transactional(Transactional.TxType.REQUIRED)
     protected void setCategorySystem(final Domain domain) {
         Objects.requireNonNull(domain);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
index b476c6015..8d491c256 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemFormController.java
@@ -47,6 +47,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
+ * Controller for processing the {@code POST} requests from the form for
+ * creating and editing category systems.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -82,6 +84,11 @@ public class CategorySystemFormController {
     @FormParam("released")
     private String released;
 
+    /**
+     * Creates a new category system (domain).
+     *
+     * @return Redirect to the list of category systems.
+     */
     @POST
     @Path("/new")
     @AuthorizationRequired
@@ -117,6 +124,13 @@ public class CategorySystemFormController {
         return "redirect:/categorymanager/categorysystems";
     }
 
+    /**
+     * Update a category with the data from the form.
+     *
+     * @param identifierParam Identifier of the category system to update.
+     *
+     * @return Redirect to the details page of the category system.
+     */
     @POST
     @Path("{categorySystemIdentifier}/edit")
     @AuthorizationRequired
@@ -191,6 +205,12 @@ public class CategorySystemFormController {
         }
     }
 
+    /**
+     * Helper method for converting the {@link #released} date to an ISO 8601
+     * formatted string.
+     *
+     * @return The released date in ISO 8601 format.
+     */
     private LocalDate convertReleased() {
         return LocalDate.parse(
             released,
@@ -198,6 +218,11 @@ public class CategorySystemFormController {
         );
     }
 
+    /**
+     * Helper method for validating a URI.
+     *
+     * @return {@code true} if the URI is valid, {@code false} otherwise.
+     */
     private boolean isValidUri() {
         final UrlValidator urlValidator = new UrlValidator();
         return urlValidator.isValid(uri);
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerOption.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerOption.java
index f0947a8f7..a0362daf3 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerOption.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerOption.java
@@ -23,7 +23,8 @@ import org.libreccm.web.CcmApplication;
 import java.util.Objects;
 
 /**
- *
+ * DTO for the options for selecting the owner applications of a category system. 
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class CategorySystemOwnerOption
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerRow.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerRow.java
index a7ac37117..c258b2619 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerRow.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemOwnerRow.java
@@ -19,7 +19,8 @@
 package org.libreccm.ui.admin.categories;
 
 /**
- *
+ * Data for a row in the table of owner applications of a category system.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class CategorySystemOwnerRow 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java
index 1ae934808..3cf5693b4 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemTableRow.java
@@ -24,7 +24,8 @@ import java.util.Map;
 import java.util.Objects;
 
 /**
- *
+ * Data for a row in the table of category systems.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class CategorySystemTableRow implements
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
index c4f6c4e87..b70335f61 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java
@@ -49,6 +49,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
+ * Controller for the UI for managing category systems.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -78,13 +79,11 @@ public class CategorySystemsController {
     @Inject
     private Models models;
 
-//    @GET
-//    @Path("/")
-//    @AuthorizationRequired
-//    @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
-//    public String getCategoryManager() {
-//        return getCategorySystems();
-//    }
+    /**
+     * Show a list of all available category systems.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -93,6 +92,14 @@ public class CategorySystemsController {
         return "org/libreccm/ui/admin/categories/categorysystems.xhtml";
     }
 
+    /**
+     * Display the details of a category system.
+     *
+     * @param categorySystemIdentifier Identifier of the category system to
+     *                                 show.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/{categorySystemIdentifier}/details")
     @AuthorizationRequired
@@ -141,6 +148,11 @@ public class CategorySystemsController {
         }
     }
 
+    /**
+     * Show the form for creating a new category system.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/new")
     @AuthorizationRequired
@@ -149,6 +161,14 @@ public class CategorySystemsController {
         return "org/libreccm/ui/admin/categories/categorysystem-form.xhtml";
     }
 
+    /**
+     * Edit a category system.
+     *
+     * @param categorySystemIdentifier Identifier of the category system to
+     *                                 edit.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/{categorySystemIdentifier}/edit")
     @AuthorizationRequired
@@ -198,6 +218,15 @@ public class CategorySystemsController {
         }
     }
 
+    /**
+     * Delete a category system and all its categories.
+     *
+     * @param categorySystemIdentifier Identifier of the category system to
+     *                                 delete.
+     * @param confirmed                Was the deletion confirmed by the user?
+     *
+     * @return Redirect to the categorysystems overview.
+     */
     @POST
     @Path("/{categorySystemIdentifier}/delete")
     @AuthorizationRequired
@@ -250,6 +279,15 @@ public class CategorySystemsController {
         return "redirect:categorymanager/categorysystems";
     }
 
+    /**
+     * Adds a localized title the a category system.
+     *
+     * @param categorySystemIdentifier Identifier of the category system.
+     * @param localeParam              The locale of the title.
+     * @param value                    The localized title.
+     *
+     * @return Redirect to the details page of the category system.
+     */
     @POST
     @Path("/{identifier}/title/add")
     @AuthorizationRequired
@@ -306,6 +344,15 @@ public class CategorySystemsController {
         }
     }
 
+    /**
+     * Updates a localized title the a category system.
+     *
+     * @param categorySystemIdentifier Identifier of the category system.
+     * @param localeParam              The locale of the title.
+     * @param value                    The localized title.
+     *
+     * @return Redirect to the details page of the category system.
+     */
     @POST
     @Path("/{identifier}/title/${locale}/edit")
     @AuthorizationRequired
@@ -362,6 +409,14 @@ public class CategorySystemsController {
         }
     }
 
+    /**
+     * Removes a localized title the a category system.
+     *
+     * @param categorySystemIdentifier Identifier of the category system.
+     * @param localeParam              The locale of the title.
+     *
+     * @return Redirect to the details page of the category system.
+     */
     @POST
     @Path("/{identifier}/title/${locale}/remove")
     @AuthorizationRequired
@@ -422,6 +477,15 @@ public class CategorySystemsController {
         }
     }
 
+    /**
+     * Adds a localized description the a category system.
+     *
+     * @param categorySystemIdentifier Identifier of the category system.
+     * @param localeParam              The locale of the description.
+     * @param value                    The localized description.
+     *
+     * @return Redirect to the details page of the category system.
+     */
     @POST
     @Path("/{identifier}/description/add")
     @AuthorizationRequired
@@ -478,6 +542,15 @@ public class CategorySystemsController {
         }
     }
 
+    /**
+     * Updates a localized description the a category system.
+     *
+     * @param categorySystemIdentifier Identifier of the category system.
+     * @param localeParam              The locale of the description.
+     * @param value                    The localized description.
+     *
+     * @return Redirect to the details page of the category system.
+     */
     @POST
     @Path(
         "categorysystems/{identifier}/description/${locale}/edit"
@@ -536,6 +609,14 @@ public class CategorySystemsController {
         }
     }
 
+    /**
+     * Removes a localized description of a category system.
+     *
+     * @param categorySystemIdentifier Identifier of the category system.
+     * @param localeParam              The locale of the description.
+     *
+     * @return Redirect to the details page of the category system.
+     */
     @POST
     @Path(
         "categorysystems/{identifier}/description/${locale}/remove")
@@ -596,6 +677,15 @@ public class CategorySystemsController {
         }
     }
 
+    /**
+     * Adds an owner to a category system.
+     *
+     * @param categorySystemIdentifier Identifier of teh category system.
+     * @param applicationUuid          UUID of the new owner.
+     * @param context                  An optional context.
+     *
+     * @return Redirect to the details page of the category system.
+     */
     @POST
     @Path("/{categorySystemIdentifier}/owners/add")
     @AuthorizationRequired
@@ -675,6 +765,15 @@ public class CategorySystemsController {
         }
     }
 
+    /**
+     * Remove an owner from a category system.
+     *
+     * @param categorySystemIdentifier Identifier of teh category system.
+     * @param applicationUuid          UUID of the owner to remove.
+     * @param confirmed Was the deletion confirmed by the user?
+     *
+     * @return Redirect to the details page of the category system.
+     */
     @POST
     @Path("/{categorySystemIdentifier}/owners/${applicationUuid}/remove")
     @AuthorizationRequired
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
index 516bb12be..62d56642c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsTableModel.java
@@ -38,6 +38,11 @@ import javax.transaction.Transactional;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
+/**
+ * Model providing the data for the table of category systems.
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
 @RequestScoped
 @Named("CategorySystemsTableModel")
 public class CategorySystemsTableModel {
@@ -45,6 +50,13 @@ public class CategorySystemsTableModel {
     @Inject
     private DomainRepository domainRepository;
 
+    /**
+     * Get all available category systems
+     *
+     * @return A list of
+     *         {@link org.libreccm.ui.admin.categories.CategorySystemTableRow}
+     *         items, one for each available category.
+     */
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional
@@ -57,6 +69,16 @@ public class CategorySystemsTableModel {
             .collect(Collectors.toList());
     }
 
+    /**
+     * Helper method for building a
+     * {@link org.libreccm.ui.admin.categories.CategorySystemTableRow} instance
+     * for a category system.
+     *
+     * @param domain The domain (category system) to convert.
+     *
+     * @return A {@link org.libreccm.ui.admin.categories.CategorySystemTableRow}
+     *         instance for the category.
+     */
     private CategorySystemTableRow buildTableRow(final Domain domain) {
         final CategorySystemTableRow row = new CategorySystemTableRow();
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/DomainNodeModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/DomainNodeModel.java
index b5ec284f1..e48aada08 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/DomainNodeModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/DomainNodeModel.java
@@ -18,7 +18,10 @@
  */
 package org.libreccm.ui.admin.categories;
 
+import org.libreccm.categorization.Domain;
+
 /**
+ * DTO with the data about a {@link Domain} shown in the UI.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -37,11 +40,11 @@ public class DomainNodeModel {
     protected void setDomainId(final long domainId) {
         this.domainId = domainId;
     }
-    
+
     public String getIdentifier() {
         return String.format("ID-%s", domainId);
     }
-    
+
     public String getUuid() {
         return uuid;
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/package-info.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/package-info.java
new file mode 100644
index 000000000..8a48ddc23
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/**
+ * UI for managing category systems (domains) and categories.
+ */
+package org.libreccm.ui.admin.categories;
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
index a6ab323c2..1a6028cc6 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationController.java
@@ -38,6 +38,7 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
 /**
+ * Controller for the UI for managing the configuration of CCM.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -51,10 +52,15 @@ public class ConfigurationController {
 
     @Inject
     private GlobalizationHelper globalizationHelper;
-    
+
     @Inject
     private Models models;
 
+    /**
+     * Show all available configurations (groups of settings).
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -69,10 +75,20 @@ public class ConfigurationController {
             .collect(Collectors.toList());
 
         models.put("configurationClasses", configurationClasses);
-        
+
         return "org/libreccm/ui/admin/configuration/configuration.xhtml";
     }
 
+    /**
+     * Helper method for converting a
+     * {@link org.libreccm.configuration.ConfigurationInfo} instance into a
+     * {@link org.libreccm.ui.admin.configuration.ConfigurationTableEntry}
+     * instance.
+     *
+     * @param confInfo Configuration info to convert.
+     *
+     * @return A {@link ConfigurationTableEntry} for the configuration.
+     */
     private ConfigurationTableEntry buildTableEntry(
         final ConfigurationInfo confInfo
     ) {
@@ -83,7 +99,7 @@ public class ConfigurationController {
             .getLocalizedTextsUtil(confInfo.getDescBundle());
         entry.setTitle(util.getText(confInfo.getTitleKey()));
         entry.setDescription(util.getText(confInfo.getDescKey()));
-        
+
         return entry;
     }
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
index 1a0f38922..1b0020b94 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationPage.java
@@ -27,12 +27,15 @@ import java.util.Set;
 import javax.enterprise.context.ApplicationScoped;
 
 /**
+ * {@link AdminPage} implementation providing the UI for managing the
+ * configuration of CCM.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @ApplicationScoped
 public class ConfigurationPage implements AdminPage {
-     @Override
+
+    @Override
     public Set<Class<?>> getControllerClasses() {
         final Set<Class<?>> classes = new HashSet<>();
         classes.add(ConfigurationController.class);
@@ -59,7 +62,7 @@ public class ConfigurationPage implements AdminPage {
 
     @Override
     public String getDescriptionBundle() {
-       return AdminConstants.ADMIN_BUNDLE;
+        return AdminConstants.ADMIN_BUNDLE;
     }
 
     @Override
@@ -76,4 +79,5 @@ public class ConfigurationPage implements AdminPage {
     public int getPosition() {
         return 30;
     }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationTableEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationTableEntry.java
index 9879542a5..b713dfd9e 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationTableEntry.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/ConfigurationTableEntry.java
@@ -21,7 +21,8 @@ package org.libreccm.ui.admin.configuration;
 import java.util.Objects;
 
 /**
- *
+ * A row in the table of available configurations.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class ConfigurationTableEntry
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
index 68ac0b7bd..04b17048b 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
@@ -54,7 +54,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
- *
+ * Controller for the UI for viewing and editing settings.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Controller
@@ -78,6 +79,12 @@ public class SettingsController {
     @Inject
     private SettingManager settingManager;
 
+    /**
+     * Show all settings of a configuration.
+     * 
+     * @param configurationClass The configuration class
+     * @return The template to use.
+     */
     @GET
     @Path("/")
     @Transactional(Transactional.TxType.REQUIRED)
@@ -146,6 +153,13 @@ public class SettingsController {
         return "org/libreccm/ui/admin/configuration/settings.xhtml";
     }
 
+    /**
+     * Helper method for building a {@link SettingsTableEntry} for a setting.
+     * 
+     * @param settingInfo The setting to convert.
+     * @param configuration The configuration to which the settings belongs.
+     * @return A {@link SettingsTableEntry} for the setting.
+     */
     @Transactional(Transactional.TxType.REQUIRED)
     private SettingsTableEntry buildSettingsTableEntry(
         final SettingInfo settingInfo,
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsTableEntry.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsTableEntry.java
index bf83bb223..bf723f1dd 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsTableEntry.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsTableEntry.java
@@ -21,7 +21,8 @@ package org.libreccm.ui.admin.configuration;
 import java.util.Objects;
 
 /**
- *
+ * Data for row in the table of settings of a configuration.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class SettingsTableEntry implements Comparable<SettingsTableEntry> {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/package-info.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/package-info.java
new file mode 100644
index 000000000..b17aa4980
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/**
+ * UI for editing the configuration of LibreCCM.
+ */
+package org.libreccm.ui.admin.configuration;
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java
index d651b3453..efadf444b 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardController.java
@@ -28,7 +28,8 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
 /**
- *
+ * Controller for the dashboard page (start page) of the Admin UI:
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
@@ -36,6 +37,11 @@ import javax.ws.rs.Path;
 @Path("/")
 public class DashboardController {
     
+    /**
+     * Show the dashboard page.
+     * 
+     * @return The template to use.
+     */
     @GET
     @Path("/")
     @AuthorizationRequired
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java
index 51276a54a..42dde7292 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/DashboardPage.java
@@ -20,7 +20,6 @@ package org.libreccm.ui.admin.dashboard;
 
 import org.libreccm.ui.admin.AdminConstants;
 import org.libreccm.ui.admin.AdminPage;
-import org.libreccm.ui.admin.configuration.ConfigurationController;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -28,12 +27,14 @@ import java.util.Set;
 import javax.enterprise.context.ApplicationScoped;
 
 /**
+ * {@link AdminPage} implementation for the dashboard page.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @ApplicationScoped
 public class DashboardPage implements AdminPage {
-     @Override
+
+    @Override
     public Set<Class<?>> getControllerClasses() {
         final Set<Class<?>> classes = new HashSet<>();
         classes.add(DashboardController.class);
@@ -59,7 +60,7 @@ public class DashboardPage implements AdminPage {
 
     @Override
     public String getDescriptionBundle() {
-       return AdminConstants.ADMIN_BUNDLE;
+        return AdminConstants.ADMIN_BUNDLE;
     }
 
     @Override
@@ -76,4 +77,5 @@ public class DashboardPage implements AdminPage {
     public int getPosition() {
         return 0;
     }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/package-info.java b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/package-info.java
new file mode 100644
index 000000000..362349c53
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/dashboard/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/**
+ * Start page of the Admin UI.
+ */
+package org.libreccm.ui.admin.dashboard;
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTask.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTask.java
index 6ecbc907e..b4fb8d8c2 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTask.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTask.java
@@ -25,17 +25,30 @@ import java.util.Collection;
 import java.util.Collections;
 
 /**
- *
+ * Data for an export task.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class ExportTask {
 
+    /**
+     * Name of the export archive.
+     */
     private final String name;
 
+    /**
+     * When was the export task started?
+     */
     private final LocalDate started;
 
+    /**
+     * The entities to export.
+     */
     private final Collection<Exportable> entities;
     
+    /**
+     * The status of the export task.
+     */
     private final ExportTaskStatus status;
 
     public ExportTask(
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java
index 2e63bbd16..0a1168e1b 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ExportTaskStatus.java
@@ -25,17 +25,30 @@ import java.util.Comparator;
 import java.util.Objects;
 
 /**
- *
+ * Status of an export task.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class ExportTaskStatus implements Comparable<ExportTaskStatus> {
 
+    /**
+     * Name of the export archive.
+     */
     private String name;
 
+    /**
+     * When was the task started?
+     */
     private LocalDateTime started;
 
+    /**
+     * Status of the export task.
+     */
     private ImExportTaskStatus status;
 
+    /**
+     * If the proces throw an exception, it is stored here.
+     */
     private Throwable exception;
 
     public String getName() {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
index 8d96f650c..7afe02994 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportController.java
@@ -41,11 +41,11 @@ import javax.mvc.Controller;
 import javax.mvc.Models;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 
 /**
+ * Controller for the Import/Export UI.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -63,6 +63,12 @@ public class ImExportController {
     @Inject
     private Models models;
 
+    /**
+     * Provides the main page with an overview of all running import/export
+     * processes.
+     *
+     * @return
+     */
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -71,6 +77,11 @@ public class ImExportController {
         return "org/libreccm/ui/admin/imexport/imexport.xhtml";
     }
 
+    /**
+     * UI for starting exports.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/export")
     @AuthorizationRequired
@@ -99,6 +110,14 @@ public class ImExportController {
         return "org/libreccm/ui/admin/imexport/export.xhtml";
     }
 
+    /**
+     * Starts an export.
+     *
+     * @param selectedEntitiesParam The entity types selected for export.
+     * @param exportName            The name of the export archive.
+     *
+     * @return Redirect to the main import/export page.
+     */
     @POST
     @Path("/export")
     @AuthorizationRequired
@@ -135,6 +154,11 @@ public class ImExportController {
         return "redirect:imexport";
     }
 
+    /**
+     * Displays the import page that allows to select a import archive.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/import")
     @AuthorizationRequired
@@ -157,6 +181,13 @@ public class ImExportController {
         return "org/libreccm/ui/admin/imexport/import.xhtml";
     }
 
+    /**
+     * Execute an import.
+     *
+     * @param importArchive The name of the import archive to use.
+     *
+     * @return Redirect to to the main import/export page.
+     */
     @POST
     @Path("/import")
     @AuthorizationRequired
@@ -169,10 +200,34 @@ public class ImExportController {
         return "redirect:imexport";
     }
 
+    /**
+     * Merge function for {@link Collectors#toMap(java.util.function.Function, java.util.function.Function, java.util.function.BinaryOperator, java.util.function.Supplier).
+     *
+     * @param str1 First key
+     * @param str2 Second key
+     *
+     * @return First key.
+     *
+     * @throws RuntimeException if both keys are equal.
+     */
     private String noDuplicateKeys(final String str1, final String str2) {
-        throw new RuntimeException("No duplicate keys allowed.");
+        if (str1.equals(str2)) {
+            throw new RuntimeException("No duplicate keys allowed.");
+        } else {
+            return str1;
+        }
     }
 
+    /**
+     * Helper method for adding required entities to an export task. Some entity
+     * types require also other entity types. This method traverses through the
+     * selected entity types of an export and adds required entity types if
+     * necessary.
+     *
+     * @param selectedNodes The selected entity types.
+     *
+     * @return The final list of exported types.
+     */
     private Set<EntityImExporterTreeNode> addRequiredEntities(
         final Set<EntityImExporterTreeNode> selectedNodes
     ) {
@@ -196,6 +251,16 @@ public class ImExportController {
         }
     }
 
+    /**
+     * Helper function to build an
+     * {@link org.libreccm.ui.admin.imexport.ImportOption} instance from a
+     * {@link org.libreccm.imexport.ImportManifest}.
+     *
+     * @param manifest The manifest to map to a
+     *                 {@link org.libreccm.ui.admin.imexport.ImportOption}.
+     *
+     * @return An {@link org.libreccm.ui.admin.imexport.ImportOption} instance.
+     */
     private ImportOption buildImportOption(final ImportManifest manifest) {
         return new ImportOption(
             manifest.getImportName(),
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
index e41b58555..2b00defd0 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportPage.java
@@ -27,7 +27,8 @@ import java.util.Set;
 import javax.enterprise.context.ApplicationScoped;
 
 /**
- *
+ * Provides the UI for importing and exporting entities.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @ApplicationScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatus.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatus.java
index 1e127b578..9b9b4de8e 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatus.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTaskStatus.java
@@ -19,13 +19,23 @@
 package org.libreccm.ui.admin.imexport;
 
 /**
- *
+ * Enumeration for the possible states of an export or import task.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public enum ImExportTaskStatus {
 
+    /**
+     * An error occured during the process.
+     */
     ERROR,
+    /**
+     * The import or export task is finished.
+     */
     FINISHED,
+    /**
+     * The task is still running.
+     */
     RUNNING,
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
index 1804a5c59..4e7722729 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImExportTasks.java
@@ -29,6 +29,8 @@ import javax.inject.Inject;
 import javax.transaction.Transactional;
 
 /**
+ * Listens for CDI events fired by {@link org.libreccm.ui.admin.imexport.ImportExportTaskManager}
+ * and executes tasks.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -38,23 +40,33 @@ public class ImExportTasks {
     @Inject
     private ImportExport importExport;
 
-    
+    /**
+     * Listens for {@link org.libreccm.ui.admin.imexport.ExportTask}s.
+     * 
+     * @param task The task to execute.
+     * @return The task.
+     */
     @Transactional(Transactional.TxType.REQUIRED)
     public ExportTask exportEntities(@ObservesAsync final ExportTask task) {
         final Collection<Exportable> entities = task.getEntities();
         final String exportName = task.getName();
-        
+
         importExport.exportEntities(entities, exportName);
         task.getStatus().setStatus(ImExportTaskStatus.FINISHED);
         return task;
     }
-    
+
+    /**
+     * Listens for {@link org.libreccm.ui.admin.imexport.ImportTask}s.
+     * 
+     * @param task The task to execute.
+     * @return The task.
+     */
     @Transactional(Transactional.TxType.REQUIRED)
     public void importEntitites(@ObservesAsync final ImportTask task) {
         final String importName = task.getName();
-        
+
         importExport.importEntities(importName);
     }
-    
 
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
index b9bd1e56c..23a93d3b9 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportExportTaskManager.java
@@ -30,6 +30,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.concurrent.CompletionStage;
 
 import javax.ejb.Schedule;
 import javax.enterprise.context.ApplicationScoped;
@@ -43,6 +44,7 @@ import javax.persistence.criteria.Root;
 import javax.transaction.Transactional;
 
 /**
+ * Provides the backend for importing and exporting entities.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -54,17 +56,34 @@ public class ImportExportTaskManager {
         ImportExportTaskManager.class
     );
 
+    /**
+     * Entity manager used for some special queries. To execute import and
+     * export tasks concurrently CDI events are used which are processed by the
+     * {@link ImExportTasks} class.
+     */
     @Inject
     private EntityManager entityManager;
 
+    /**
+     * CDI event sender for export tasks.
+     */
     @Inject
     private Event<ExportTask> exportTaskSender;
 
+    /**
+     * CDI event sender for import tasks.
+     */
     @Inject
     private Event<ImportTask> importTaskSender;
 
+    /**
+     * Status of all active export tasks.
+     */
     private final SortedSet<ExportTaskStatus> exportTasks;
 
+    /**
+     * Status of all active import tasks.
+     */
     private final SortedSet<ImportTaskStatus> importTasks;
 
     public ImportExportTaskManager() {
@@ -80,14 +99,31 @@ public class ImportExportTaskManager {
         );
     }
 
+    /**
+     * Returns the active export tasks.
+     *
+     * @return All active export tasks.
+     */
     public SortedSet<ExportTaskStatus> getExportTasks() {
         return Collections.unmodifiableSortedSet(exportTasks);
     }
 
+    /**
+     * Returns the active import tasks.
+     *
+     * @return All active import tasks.
+     */
     public SortedSet<ImportTaskStatus> getImportTasks() {
         return Collections.unmodifiableSortedSet(importTasks);
     }
 
+    /**
+     * Export all entities of the selected entity types.
+     *
+     * @param exportTypes The entity types to export.
+     * @param exportName  Name of the export archive.
+     *
+     */
     @Transactional(Transactional.TxType.REQUIRED)
     public void exportEntities(
         final Set<Class<? extends Exportable>> exportTypes,
@@ -107,7 +143,7 @@ public class ImportExportTaskManager {
         taskStatus.setStarted(LocalDateTime.now());
         exportTaskSender.fireAsync(
             new ExportTask(exportName, LocalDate.now(), entities, taskStatus)
-        ).handle((task , ex) -> handleExportTaskResult(task, ex, taskStatus));
+        ).handle((task, ex) -> handleExportTaskResult(task, ex, taskStatus));
 
         taskStatus.setStatus(ImExportTaskStatus.RUNNING);
         exportTasks.add(taskStatus);
@@ -119,18 +155,32 @@ public class ImportExportTaskManager {
         importTaskSender.fireAsync(
             new ImportTask(importName, LocalDate.now(), taskStatus)
         ).handle((task, ex) -> handleImportTaskResult(task, ex, taskStatus));
-        
+
         taskStatus.setStatus(ImExportTaskStatus.RUNNING);
         importTasks.add(taskStatus);
     }
 
+    /**
+     * Called every 5 minutes to remove finished tasks from {@link #exportTasks}
+     * and and {@link #importTasks}.
+     */
     @Schedule(hour = "*", minute = "*/5", persistent = false)
     protected void removeFinishedTasks() {
-        exportTasks.removeIf(taskStatus -> taskStatus.getStatus() == ImExportTaskStatus.FINISHED);
-//        importTasks.removeIf(taskStatus -> taskStatus.getStatus() == ImExportTaskStatus.FINISHED);
+        exportTasks.removeIf(
+            taskStatus -> taskStatus.getStatus() == ImExportTaskStatus.FINISHED
+        );
+        importTasks.removeIf(
+            taskStatus -> taskStatus.getStatus() == ImExportTaskStatus.FINISHED
+        );
     }
 
-    
+    /**
+     * Collects the entities of the provided types for exporting.
+     *
+     * @param ofType The entity type.
+     *
+     * @return All entities of the provided type.
+     */
     private Set<? extends Exportable> collectEntities(
         final Class<Exportable> ofType
     ) {
@@ -145,6 +195,19 @@ public class ImportExportTaskManager {
         );
     }
 
+    /**
+     * Handler function for processing the result of an export tasks.
+     *
+     * @param task   The task.
+     * @param ex     Exception thrown during the export process. If the export
+     *               process run without errors, this parameter will be
+     *               {@code null}.
+     * @param status The status of the task.
+     *
+     * @return The task.
+     * 
+     * @see CompletionStage#handle(java.util.function.BiFunction)
+     */
     private Object handleExportTaskResult(
         final ExportTask task, final Throwable ex, final ExportTaskStatus status
     ) {
@@ -159,6 +222,19 @@ public class ImportExportTaskManager {
         return task;
     }
 
+    /**
+     * Handler function for processing the result of an import tasks.
+     *
+     * @param task   The task.
+     * @param ex     Exception thrown during the import process. If the import
+     *               process run without errors, this parameter will be
+     *               {@code null}.
+     * @param status The status of the task.
+     *
+     * @return The task.
+     *
+     * @see CompletionStage#handle(java.util.function.BiFunction)
+     */
     private Object handleImportTaskResult(
         final ImportTask task, final Throwable ex, final ImportTaskStatus status
     ) {
@@ -172,4 +248,5 @@ public class ImportExportTaskManager {
         }
         return task;
     }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportOption.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportOption.java
index 6ffee8514..a62f73a74 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportOption.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportOption.java
@@ -18,16 +18,26 @@
  */
 package org.libreccm.ui.admin.imexport;
 
+import org.libreccm.imexport.ImportManifest;
+
 import java.util.Objects;
 
 /**
+ * Provides a preprocessed {@link ImportManifest} for easier use in a template.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class ImportOption implements Comparable<ImportOption> {
 
+    /**
+     * Name of the import.
+     */
     private final String importName;
 
+    /**
+     * Label of the import, includes the relevant data from the
+     * {@link ImportManifest}.
+     */
     private final String label;
 
     public ImportOption(
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java
index 2ea5bc252..d3a9d217f 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTask.java
@@ -21,15 +21,25 @@ package org.libreccm.ui.admin.imexport;
 import java.time.LocalDate;
 
 /**
+ * Data for an import task.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class ImportTask {
 
+    /**
+     * Name of the import archive.
+     */
     private final String name;
 
+    /**
+     * When was the import task started?
+     */
     private final LocalDate started;
 
+    /**
+     * The status of the import task.
+     */
     private final ImportTaskStatus status;
 
     public ImportTask(
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
index 8ec1ea92b..db9509f6c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/ImportTaskStatus.java
@@ -25,24 +25,36 @@ import java.util.Comparator;
 import java.util.Objects;
 
 /**
+ * Status of an import task.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
 
+    /**
+     * Name of the import archive.
+     */
     private String name;
 
+    /**
+     * When was the task started?
+     */
     private LocalDateTime started;
 
+    /**
+     * Status of the import task.
+     */
     private ImExportTaskStatus status;
-    
+
+    /**
+     * If the proces throw an exception, it is stored here.
+     */
     private Throwable exception;
 
     public String getName() {
         return name;
     }
 
-   
     protected void setName(final String name) {
         this.name = name;
     }
@@ -62,8 +74,8 @@ public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
     protected void setStatus(final ImExportTaskStatus status) {
         this.status = status;
     }
-    
-        public Throwable getException() {
+
+    public Throwable getException() {
         return exception;
     }
 
@@ -71,7 +83,7 @@ public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
         this.exception = exception;
     }
 
-     @Override
+    @Override
     public int hashCode() {
         int hash = 7;
         hash = 53 * hash + Objects.hashCode(name);
@@ -104,7 +116,6 @@ public class ImportTaskStatus implements Comparable<ImportTaskStatus> {
         return status == other.getStatus();
     }
 
-    
     public boolean canEqual(final Object obj) {
         return obj instanceof ImportTaskStatus;
     }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/package-info.java b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/package-info.java
new file mode 100644
index 000000000..011755e60
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/imexport/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/**
+ * UI for importing and exporting entities.
+ */
+package org.libreccm.ui.admin.imexport;
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteDetailsModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteDetailsModel.java
index 60fd9b9d1..c3c3041c6 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteDetailsModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteDetailsModel.java
@@ -22,7 +22,6 @@ import org.libreccm.sites.Site;
 import org.libreccm.theming.ThemeInfo;
 import org.libreccm.ui.Message;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -33,6 +32,7 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 
 /**
+ * Model providing the properties of a site for the UI.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -96,6 +96,12 @@ public class SiteDetailsModel {
         messages.add(message);
     }
 
+    /**
+     * Set the properties of this model to the values of the properties of the
+     * provided site.
+     *
+     * @param site The site.
+     */
     protected void setSite(final Site site) {
         Objects.requireNonNull(site);
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteFormController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteFormController.java
index a99e8fd03..9343f8c45 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteFormController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteFormController.java
@@ -42,6 +42,8 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
+ * Controller for processing the {@code POST} requests from the form for
+ * creating and editing sites.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -71,6 +73,11 @@ public class SiteFormController {
     @FormParam("defaultTheme")
     private String defaultTheme;
 
+    /**
+     * Create a new site.
+     * 
+     * @return Redirect to the sites overview.
+     */
     @POST
     @Path("/new")
     @AuthorizationRequired
@@ -90,6 +97,12 @@ public class SiteFormController {
         return "redirect:sites";
     }
 
+    /**
+     * Update a site with the data from the form.
+     * 
+     * @param siteIdentifierParam The identifier of the site to update.
+     * @return Redirect to the details page of the site.
+     */
     @POST
     @Path("/{siteIdentifier}/edit")
     @AuthorizationRequired
@@ -147,6 +160,9 @@ public class SiteFormController {
         }
     }
 
+    /**
+     * Helper method for resetting the default site of an installation.
+     */
     private void resetDefaultSite() {
         final Optional<Site> result = siteRepository
             .findDefaultSite();
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteTableRow.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteTableRow.java
index 1c4df5c8a..98d942603 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteTableRow.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SiteTableRow.java
@@ -19,7 +19,8 @@
 package org.libreccm.ui.admin.sites;
 
 /**
- *
+ * Data for a row in the table showing all available sites.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class SiteTableRow {
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
index 1d84fc313..06c4e3fee 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesController.java
@@ -47,6 +47,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
+ * Primary controller for the UI for managing sites.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -73,6 +74,11 @@ public class SitesController {
     @Inject
     private Themes themes;
 
+    /**
+     * Show all available sites.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -91,6 +97,13 @@ public class SitesController {
         return "org/libreccm/ui/admin/sites/sites.xhtml";
     }
 
+    /**
+     * Show the details of a site.
+     *
+     * @param siteIdentifierParam Identifier of the site to show.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/{siteIdentifier}/details")
     @AuthorizationRequired
@@ -137,6 +150,11 @@ public class SitesController {
         }
     }
 
+    /**
+     * Show the form for creating a new site.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/new")
     @AuthorizationRequired
@@ -147,6 +165,13 @@ public class SitesController {
         return "org/libreccm/ui/admin/sites/site-form.xhtml";
     }
 
+    /**
+     * Show the form for editing a site.
+     *
+     * @param siteIdentifierParam The identifier of the site to edit.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/{siteIdentifier}/edit")
     @AuthorizationRequired
@@ -192,7 +217,15 @@ public class SitesController {
             return "org/libreccm/ui/admin/sites/site-not-found.xhtml";
         }
     }
-    
+
+    /**
+     * Delete a site.
+     *
+     * @param siteIdentifierParam The identifier of the site to delete.
+     * @param confirmed           Was the deletion confirmed by the user?
+     *
+     * @return Redirect to the list of all available sites.
+     */
     @POST
     @Path("/{identifier}/delete")
     @AuthorizationRequired
@@ -204,31 +237,40 @@ public class SitesController {
     ) {
         if ("true".equals(confirmed)) {
             final Identifier siteIdentifier = identifierParser.parseIdentifier(
-            siteIdentifierParam
-        );
+                siteIdentifierParam
+            );
 
-        final Optional<Site> result;
-        switch (siteIdentifier.getType()) {
-            case ID:
-                result = siteRepository.findById(
-                    Long.parseLong(siteIdentifier.getIdentifier())
-                );
-                break;
-            default:
-                result = siteRepository.findByUuid(
-                    siteIdentifier.getIdentifier()
-                );
-                break;
+            final Optional<Site> result;
+            switch (siteIdentifier.getType()) {
+                case ID:
+                    result = siteRepository.findById(
+                        Long.parseLong(siteIdentifier.getIdentifier())
+                    );
+                    break;
+                default:
+                    result = siteRepository.findByUuid(
+                        siteIdentifier.getIdentifier()
+                    );
+                    break;
+            }
+
+            if (result.isPresent()) {
+                siteRepository.delete(result.get());
+            }
         }
 
-        if (result.isPresent()) {
-            siteRepository.delete(result.get());
-        }
-        }
-        
         return "redirect:sites";
     }
 
+    /**
+     * Helper method for building a
+     * {@link org.libreccm.ui.admin.sites.SiteTableRow} instance for a
+     * {@link Site}.
+     *
+     * @param site The site.
+     *
+     * @return A {@link SiteTableRow} instance for the site.
+     */
     private SiteTableRow buildSiteTableRow(final Site site) {
         final SiteTableRow row = new SiteTableRow();
         row.setSiteId(site.getObjectId());
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
index 6ae053284..d9f85c4c9 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/SitesPage.java
@@ -27,7 +27,8 @@ import java.util.Set;
 import javax.enterprise.context.ApplicationScoped;
 
 /**
- *
+ * {@link AdminPage} implementation for the UI for managing sites.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @ApplicationScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/sites/package-info.java b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/package-info.java
new file mode 100644
index 000000000..2326c0214
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/sites/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/**
+ * UI for managing sites.
+ */
+package org.libreccm.ui.admin.sites;
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
index a85cd9521..97e038520 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationController.java
@@ -30,6 +30,7 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
 /**
+ * Controller for the systeminformations page.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -37,10 +38,12 @@ import javax.ws.rs.Path;
 @Controller
 @Path("/systeminformation")
 public class SystemInformationController {
-    
-    @Inject
-    private MvcContext mvc; 
-    
+
+    /**
+     * Show the system information page.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -48,5 +51,5 @@ public class SystemInformationController {
     public String getSystemInformation() {
         return "org/libreccm/ui/admin/systeminformation.xhtml";
     }
-    
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java
index 99b0b3b58..146a31ea1 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationModel.java
@@ -30,6 +30,7 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 
 /**
+ * Model providing the date for the system information page.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -37,6 +38,12 @@ import javax.inject.Named;
 @Named("SystemInformationModel")
 public class SystemInformationModel {
 
+    /**
+     * Get some data about this LibreCCM installation, eg. version, application
+     * name, and homepage.
+     *
+     * @return The information about this CCM installation.
+     */
     public Map<String, String> getCcmSystemInformation() {
         final Properties properties = new Properties();
         try {
@@ -64,6 +71,11 @@ public class SystemInformationModel {
         return sysInfo;
     }
 
+    /**
+     * Get the Java System Properties from the runtime environment.
+     * 
+     * @return The Java System Properties of the runtime environment.
+     */
     public Map<String, String> getJavaSystemProperties() {
         final Properties systemProperties = System.getProperties();
         final Map<String, String> result = new HashMap<>();
@@ -74,4 +86,5 @@ public class SystemInformationModel {
         }
         return result;
     }
+
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
index b2fcb5a73..151aceff4 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/SystemInformationPage.java
@@ -27,7 +27,8 @@ import org.libreccm.ui.admin.AdminPage;
 import javax.enterprise.context.ApplicationScoped;
 
 /**
- *
+ * {@link AdminPage} implementaton for the system information page.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @ApplicationScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/package-info.java b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/package-info.java
new file mode 100644
index 000000000..a78260d3b
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/systeminformation/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/**
+ * UI for inspecting some information about LibreCCM and the runtime environment.
+ */
+package org.libreccm.ui.admin.systeminformation;
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesController.java
index f3ed452cb..8036e6c5c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesController.java
@@ -21,12 +21,7 @@ package org.libreccm.ui.admin.themes;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
-import org.libreccm.theming.ThemeInfo;
 import org.libreccm.theming.Themes;
-import org.libreccm.theming.manager.ThemeManager;
-;
-
-import java.util.List;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
@@ -40,11 +35,10 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 /**
+ * Primary controller for the UI for managing themes.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-
-
 @RequestScoped
 @Controller
 @Path("/themes")
@@ -53,10 +47,14 @@ public class ThemesController {
     @Inject
     private Themes themes;
 
-  
     @Inject
     private Models models;
 
+    /**
+     * Show all available themes.
+     *
+     * @return The template to use.
+     */
     @GET
     @Path("/")
     @AuthorizationRequired
@@ -66,6 +64,14 @@ public class ThemesController {
         return "org/libreccm/ui/admin/themes/themes.xhtml";
     }
 
+    /**
+     * Create a new theme.
+     *
+     * @param themeName    The name of the new theme.
+     * @param providerName The provider of the new theme.
+     *
+     * @return Redirect to the list of available themes.
+     */
     @POST
     @Path("/new")
     @AuthorizationRequired
@@ -76,10 +82,17 @@ public class ThemesController {
         @FormParam("providerName") final String providerName
     ) {
         themes.createTheme(themeName, providerName);
-        
+
         return "redirect:themes/";
     }
-    
+
+    /**
+     * (Re-)Publish a theme.
+     *
+     * @param themeName The theme to (re-)publish.
+     *
+     * @return Redirect to the list of themes.
+     */
     @POST
     @Path("/{themeName}/publish")
     @AuthorizationRequired
@@ -87,10 +100,17 @@ public class ThemesController {
     @Transactional(Transactional.TxType.REQUIRED)
     public String publishTheme(final String themeName) {
         themes.publishTheme(themeName);
-        
+
         return "redirect:themes/";
     }
-    
+
+    /**
+     * Unpublish a theme.
+     *
+     * @param themeName The theme to unpublish.
+     *
+     * @return Redirect to the list of themes.
+     */
     @POST
     @Path("/{themeName}/unpublish")
     @AuthorizationRequired
@@ -98,10 +118,17 @@ public class ThemesController {
     @Transactional(Transactional.TxType.REQUIRED)
     public String unpublishTheme(final String themeName) {
         themes.unpublishTheme(themeName);
-        
+
         return "redirect:themes/";
     }
-    
+
+    /**
+     * Delete a theme.
+     *
+     * @param themeName The theme to delete.
+     *
+     * @return Redirect to the list of themes.
+     */
     @POST
     @Path("/{themeName}/delete")
     @AuthorizationRequired
@@ -109,9 +136,8 @@ public class ThemesController {
     @Transactional(Transactional.TxType.REQUIRED)
     public String deleteTheme(@PathParam("themeName") final String themeName) {
         themes.deleteTheme(themeName);
-        
+
         return "redirect:themes/";
     }
 
-    
 }
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesModel.java b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesModel.java
index fc6c32ee5..ffa55f47c 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesModel.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesModel.java
@@ -34,12 +34,11 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.inject.Named;
 
 /**
+ * Model for the themes page.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
@@ -53,6 +52,11 @@ public class ThemesModel {
     @Inject
     private Themes themes;
 
+    /**
+     * Get all available themes.
+     *
+     * @return A list of all available themes.
+     */
     public List<ThemesTableRow> getThemes() {
         return themes
             .getAvailableThemes()
@@ -61,6 +65,12 @@ public class ThemesModel {
             .collect(Collectors.toList());
     }
 
+    /**
+     * Get all available {@link org.libreccm.theming.ThemeProvider}s which
+     * support changes and draft themes.
+     *
+     * @return
+     */
     public Map<String, String> getProviderOptions() {
         return themes
             .getThemeProviders()
@@ -75,8 +85,15 @@ public class ThemesModel {
             );
     }
 
+    /**
+     * Helper function for mapping a {@link ThemeInfo} instance to a
+     * {@link ThemesTableRow} instance.
+     *
+     * @param themeInfo The {@link ThemeInfo} instance to map.
+     *
+     * @return A {@link ThemesTableRow} instance for the theme.
+     */
     private ThemesTableRow mapThemeInfo(final ThemeInfo themeInfo) {
-
         final LocalizedTextsUtil textsUtil = globalizationHelper
             .getLocalizedTextsUtil(AdminConstants.ADMIN_BUNDLE);
 
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesPage.java b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesPage.java
index eacd43de9..bcee4b564 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesPage.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesPage.java
@@ -27,7 +27,8 @@ import java.util.Set;
 import javax.enterprise.context.ApplicationScoped;
 
 /**
- *
+ * {@link AdminPage} implementation for the UI for managing themes.
+ * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @ApplicationScoped
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesTableRow.java b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesTableRow.java
index b0b523a58..3796bbd68 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesTableRow.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/ThemesTableRow.java
@@ -24,6 +24,7 @@ import java.io.Serializable;
 import java.util.Comparator;
 
 /**
+ * Data of theme for displaying in the table of available themes.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/themes/package-info.java b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/package-info.java
new file mode 100644
index 000000000..27d9497d3
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/themes/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+/**
+ * UI for managing themes.
+ */
+package org.libreccm.ui.admin.themes;