Index: core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/main/java/org/xwiki/rendering/internal/macro/message/SuccessMesssageMacro.java =================================================================== --- core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/main/java/org/xwiki/rendering/internal/macro/message/SuccessMesssageMacro.java (revision 0) +++ core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/main/java/org/xwiki/rendering/internal/macro/message/SuccessMesssageMacro.java (revision 0) @@ -0,0 +1,42 @@ +/* + * See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * This 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 software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.xwiki.rendering.internal.macro.message; + +import org.xwiki.component.annotation.Component; + +/** + * Displays a success message. + * + * @version $Id: SuccessMesssageMacro.java 22892 2009-10-07 09:03:05Z sabageru $ + * @since 2.5M2 + */ +@Component("success") +public class SuccessMesssageMacro extends AbstractMessageMacro +{ + /** + * Create and initialize the descriptor of the macro. + */ + public SuccessMesssageMacro() + { + super("Success Message", "Displays a success message note."); + setDefaultCategory(DEFAULT_CATEGORY_FORMATTING); + } + +} Index: core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/main/resources/META-INF/components.txt =================================================================== --- core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/main/resources/META-INF/components.txt (revision 31649) +++ core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/main/resources/META-INF/components.txt (working copy) @@ -1,3 +1,4 @@ org.xwiki.rendering.internal.macro.message.InfoMessageMacro org.xwiki.rendering.internal.macro.message.WarningMessageMacro -org.xwiki.rendering.internal.macro.message.ErrorMessageMacro \ No newline at end of file +org.xwiki.rendering.internal.macro.message.ErrorMessageMacro +org.xwiki.rendering.internal.macro.message.SuccessMesssageMacro \ No newline at end of file Index: core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/test/java/org/xwiki/rendering/MessageMacroTest.java =================================================================== --- core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/test/java/org/xwiki/rendering/MessageMacroTest.java (revision 31649) +++ core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/test/java/org/xwiki/rendering/MessageMacroTest.java (working copy) @@ -29,7 +29,7 @@ /** * Unit test for {@link org.xwiki.rendering.internal.macro.message.AbstractMessageMacro} macros (for tests that cannot * be performed with the rendering test framework). - * + * * @version $Id$ * @since 2.0M3 */ @@ -47,5 +47,7 @@ Assert.assertNotNull(messageMacro.getDescriptor().getContentDescriptor()); messageMacro = getComponentManager().lookup(Macro.class, "error"); Assert.assertNotNull(messageMacro.getDescriptor().getContentDescriptor()); + messageMacro = getComponentManager().lookup(Macro.class, "success"); + Assert.assertNotNull(messageMacro.getDescriptor().getContentDescriptor()); } } Index: core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/test/java/org/xwiki/rendering/RenderingTests.java =================================================================== --- core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/test/java/org/xwiki/rendering/RenderingTests.java (revision 31649) +++ core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/test/java/org/xwiki/rendering/RenderingTests.java (working copy) @@ -41,6 +41,7 @@ suite.addTestsFromResource("macromessage2", true); suite.addTestsFromResource("macromessage3", true); suite.addTestsFromResource("macromessage4", true); + suite.addTestsFromResource("macromessage5", true); return new ComponentManagerTestSetup(suite); } Index: core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/test/resources/macromessage5.test =================================================================== --- core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/test/resources/macromessage5.test (revision 0) +++ core/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-message/src/test/resources/macromessage5.test (revision 0) @@ -0,0 +1,27 @@ +.#----------------------------------------------------- +.input|xwiki/2.0 +.# Validate that non inline content is properly supported +.#----------------------------------------------------- +{{success}} +* item1 +* item2 +{{/success}} +.#----------------------------------------------------- +.expect|event/1.0 +.#----------------------------------------------------- +beginDocument +beginMacroMarkerStandalone [success] [] [* item1 +* item2] +beginGroup [[class]=[box successmessage]] +beginList [BULLETED] +beginListItem +onWord [item1] +endListItem +beginListItem +onWord [item2] +endListItem +endList [BULLETED] +endGroup [[class]=[box successmessage]] +endMacroMarkerStandalone [success] [] [* item1 +* item2] +endDocument \ No newline at end of file Index: skins/albatross/src/main/resources/albatross/presentation.css =================================================================== --- skins/albatross/src/main/resources/albatross/presentation.css (revision 30500) +++ skins/albatross/src/main/resources/albatross/presentation.css (working copy) @@ -232,7 +232,7 @@ color: #c82; } -.errormessage, .warningmessage, .infomessage, .plainmessage{ +.errormessage, .warningmessage, .infomessage, .plainmessage, .successmessage{ margin: 4px 0px 4px; border: 1px solid #DDD; padding: 8px 8px 8px 28px; @@ -240,6 +240,11 @@ text-align: left; } +.successmessage { + background-image: url(icons/msgsuccess.png); + color: green; +} + .infomessage{ background-image: url(icons/msginfo.png); color: #369; @@ -257,7 +262,7 @@ color: #F00; } -span.errormessage, span.warningmessage, span.infomessage, span.plainmessage { +span.errormessage, span.warningmessage, span.infomessage, span.plainmessage, span.successmessage { background-position: 2px center; overflow: visible; padding: 0 2px 0 22px; Index: skins/albatross/src/main/resources/albatross/icons/msgsuccess.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: skins/albatross/src/main/resources/albatross/icons/msgsuccess.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: skins/colibri/src/main/resources/colibri/colibri.css =================================================================== --- skins/colibri/src/main/resources/colibri/colibri.css (revision 31651) +++ skins/colibri/src/main/resources/colibri/colibri.css (working copy) @@ -1398,7 +1398,7 @@ } /* ----------------------Messages------------------------*/ -.errormessage, .warningmessage, .infomessage, .plainmessage { +.errormessage, .warningmessage, .infomessage, .plainmessage, .successmessage { background: $theme.backgroundSecondaryColor 6px 8px no-repeat; border: 1px dotted $theme.borderColor; margin: 4px 0; @@ -1407,6 +1407,11 @@ text-align: justify; } +.successmessage { + background-image: url("$xwiki.getSkinFile('icons/silk/tick.gif')"); + color: green; +} + .infomessage { background-image: url("$xwiki.getSkinFile('icons/silk/information.gif')"); color: #369; @@ -1572,7 +1577,7 @@ -------------------------------------------------------------- */ /* ----------------Message Macro-------------------------*/ -span.errormessage, span.warningmessage, span.infomessage, span.plainmessage { +span.errormessage, span.warningmessage, span.infomessage, span.plainmessage, span.successmessage { background-position: 2px center; overflow: visible; padding: 0 2px 0 22px; Index: skins/toucan/src/main/resources/toucan/toucan.css =================================================================== --- skins/toucan/src/main/resources/toucan/toucan.css (revision 31651) +++ skins/toucan/src/main/resources/toucan/toucan.css (working copy) @@ -2024,6 +2024,7 @@ div.xwikipanelcontents div.infomessage, div.xwikipanelcontents div.errormessage, div.xwikipanelcontents div.plainmessage, +div.xwikipanelcontents div.successmessage, div.xwikipanelcontents table { margin-top: 0; } @@ -3881,7 +3882,7 @@ padding: 5px; } -.errormessage, .warningmessage, .infomessage, .plainmessage { +.errormessage, .warningmessage, .infomessage, .plainmessage, .successmessage { margin: 4px 0; border: 1px solid #DDD; padding: 8px 28px; @@ -3889,6 +3890,10 @@ text-align: justify; color: #555; } +.successmessage { + background-image: url("$xwiki.getSkinFile('icons/silk/tick.gif')"); + color: green; +} .infomessage { background-image: url( $xwiki.getSkinFile('icons/silk/information.gif') ); color: #369; @@ -3902,7 +3907,7 @@ color: #e14726; } -span.errormessage, span.warningmessage, span.infomessage, span.plainmessage { +span.errormessage, span.warningmessage, span.infomessage, span.plainmessage, span.successmessage { background-position: 2px center; overflow: visible; padding: 0 2px 0 22px; Index: web/standard/src/main/webapp/templates/macros.vm =================================================================== --- web/standard/src/main/webapp/templates/macros.vm (revision 31651) +++ web/standard/src/main/webapp/templates/macros.vm (working copy) @@ -1248,6 +1248,10 @@
#end +#macro(success $text) + +#end + #macro(message $text) #end