From 130eff10ed46817b0ab39a4ca3866d117dc7f08f Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 17 Jun 2014 08:13:24 +0000 Subject: [PATCH] ThemeErrors are now tagged with classes so they be formatted using CSS. git-svn-id: https://svn.libreccm.org/ccm/trunk@2705 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/ui/ImageComponentAdminListener.java | 23 ++++++++++++++----- .../mandalay/includes/bebop/bebopLabel.xsl | 2 +- .../includes/theme/themeErrorInfo.xsl | 4 ++-- .../ui/ThemeValidationPanel.java | 4 ++++ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAdminListener.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAdminListener.java index 7ca94f796..53c34ac52 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAdminListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAdminListener.java @@ -14,16 +14,16 @@ import com.arsdigita.toolbox.ui.ComponentMap; /** * A listener to administer images. - * + * * This listerner is used by {@link ImagesPane}. - * + * * @author Sören Bernstein */ class ImageComponentAdminListener extends ImageComponentAbstractListener implements ActionListener { private final ComponentMap m_pane; - public ImageComponentAdminListener(final MapComponentSelectionModel imageComponent, + public ImageComponentAdminListener(final MapComponentSelectionModel imageComponent, final ComponentMap pane) { super(imageComponent); m_pane = pane; @@ -34,10 +34,20 @@ class ImageComponentAdminListener extends ImageComponentAbstractListener impleme m_pane.reset(state); } + /** + * Call {@link #processImage(com.arsdigita.bebop.event.FormSectionEvent, + * com.arsdigita.bebop.PageState, com.arsdigita.cms.ui.ImageComponent, + * com.arsdigita.cms.ReusableImageAsset) } + * if the save button was pressed. + * + * @param event the {@link FormSectionEvent} + * + * @throws FormProcessException + */ @Override - protected void processImage(final FormSectionEvent event, - final PageState state, - final ImageComponent component, + protected void processImage(final FormSectionEvent event, + final PageState state, + final ImageComponent component, final ReusableImageAsset image) { //m_pane.reset(state); } @@ -46,4 +56,5 @@ class ImageComponentAdminListener extends ImageComponentAbstractListener impleme public void actionPerformed(final ActionEvent event) { setImageComponent(event.getPageState(), ImageComponent.UPLOAD); } + } diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl index 2405bc788..cdad28ebd 100644 --- a/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl @@ -41,7 +41,7 @@ - + diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/theme/themeErrorInfo.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/theme/themeErrorInfo.xsl index f8f3e3046..ba32b6613 100644 --- a/ccm-sci-bundle/web/themes/mandalay/includes/theme/themeErrorInfo.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/includes/theme/themeErrorInfo.xsl @@ -65,7 +65,7 @@ -
+
@@ -79,7 +79,7 @@ -
+
diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java index 4cd37b1af..dc15db372 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java @@ -286,8 +286,12 @@ class ThemeValidationPanel extends GridPanel implements ThemeDirectorConstants { super(); m_noErrorsLabel = new Label (GlobalizationUtil.globalize("themes.no_validation_errors")); + //m_noErrorsLabel.setFontWeight("bold"); + m_noErrorsLabel.setClassAttr("noErrors"); m_errorsLabel = new Label (GlobalizationUtil.globalize("themes.validation_errors")); + m_errorsLabel.setClassAttr("errors"); + //m_errorsLabel.setFontWeight("bold"); } @Override