LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
master
jensp 2014-06-17 08:13:24 +00:00
parent deff1ebf63
commit 130eff10ed
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ccm-cms/src/com/arsdigita/cms/ui/ImageComponentAdminListener.java
View File

@ -34,6 +34,16 @@ class ImageComponentAdminListener extends ImageComponentAbstractListener impleme
m_pane.reset(state); 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 @Override
protected void processImage(final FormSectionEvent event, protected void processImage(final FormSectionEvent event,
final PageState state, final PageState state,
@ -46,4 +56,5 @@ class ImageComponentAdminListener extends ImageComponentAbstractListener impleme
public void actionPerformed(final ActionEvent event) { public void actionPerformed(final ActionEvent event) {
setImageComponent(event.getPageState(), ImageComponent.UPLOAD); setImageComponent(event.getPageState(), ImageComponent.UPLOAD);
} }
} }

2
ccm-sci-bundle/web/themes/mandalay/includes/bebop/bebopLabel.xsl
View File

@ -41,7 +41,7 @@
<!-- DE Ein Text-Label mit Formatierung --> <!-- DE Ein Text-Label mit Formatierung -->
<!-- EN A formatted text label --> <!-- EN A formatted text label -->
<xsl:template match="bebop:label[@color != '' or @weight != '' or @id != '']"> <xsl:template match="bebop:label[@color != '' or @weight != '' or @id != '' or @class != '']">
<xsl:call-template name="mandalay:bebopLabelStyle"> <xsl:call-template name="mandalay:bebopLabelStyle">
<xsl:with-param name="text"> <xsl:with-param name="text">
<xsl:value-of select="."/> <xsl:value-of select="."/>

4
ccm-sci-bundle/web/themes/mandalay/includes/theme/themeErrorInfo.xsl
View File

@ -65,7 +65,7 @@
</xsl:template> </xsl:template>
<xsl:template match="theme:xslErrors"> <xsl:template match="theme:xslErrors">
<div> <div class="themeErrors">
<h5> <h5>
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'theme'"/> <xsl:with-param name="module" select="'theme'"/>
@ -79,7 +79,7 @@
</xsl:template> </xsl:template>
<xsl:template match="theme:xslFatals"> <xsl:template match="theme:xslFatals">
<div> <div class="themeErrors">
<h5> <h5>
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'theme'"/> <xsl:with-param name="module" select="'theme'"/>

4
ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java
View File

@ -286,8 +286,12 @@ class ThemeValidationPanel extends GridPanel implements ThemeDirectorConstants {
super(); super();
m_noErrorsLabel = new Label m_noErrorsLabel = new Label
(GlobalizationUtil.globalize("themes.no_validation_errors")); (GlobalizationUtil.globalize("themes.no_validation_errors"));
//m_noErrorsLabel.setFontWeight("bold");
m_noErrorsLabel.setClassAttr("noErrors");
m_errorsLabel = new Label m_errorsLabel = new Label
(GlobalizationUtil.globalize("themes.validation_errors")); (GlobalizationUtil.globalize("themes.validation_errors"));
m_errorsLabel.setClassAttr("errors");
//m_errorsLabel.setFontWeight("bold");
} }
@Override @Override