From 03b125d0990fa5d340a7ac677eb1b5c8f5e3eda8 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 2 Nov 2020 20:50:19 +0100 Subject: [PATCH] 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 Jens Pelzetter */ @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 @@ +