XWIKI-21452: Macros info, success, warning and error are only distinguished by colors

xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less

@@ -2,10 +2,52 @@
 // Messages
 // --------------------------------------------------
 
-.successmessage, .errormessage, .warningmessage, .infomessage,
-span.successmessage, span.errormessage, span.warningmessage, span.infomessage, 
-span.box { // Used by: Inline boxes and messages
-  padding: floor(@font-size-base * 0.2);
+// Used by: Inline boxes
+span.successmessage, span.errormessage, span.warningmessage, span.infomessage {
+  border: none;
+}
+
+span.box, span.successmessage, span.errormessage, span.warningmessage, span.infomessage {
+  padding: 0 floor(@font-size-base * 0.2);
+  box-shadow: none;
+  & > img {
+    // Style the silk icons
+    margin: 0 .6rem 0 .2rem;
+    vertical-align: sub;
+  }
+
+  & > span.fa {
+    // Style the font awesome icons
+    margin: 0 .6rem 0 .2rem;
+  }
+}
+
+// Used by: message boxes
+div.successmessage, div.errormessage, div.warningmessage, div.infomessage {
+  display: flex;
+  gap: 2rem;
+  justify-content: left;
+  align-items: baseline;
+  padding: 2rem;
+  border: none;
+  border-left: 4px solid;
+  box-shadow: none;
+
+  & > img {
+    // Improve alignment for silk icons
+    align-self: flex-start;
+  }
+
+  & > div > .box-title,
+  & > div > .xwiki-metadata-container[data-xwiki-parameter-name="title"] {
+    font-weight: bold;
+  }
+
+  // Main message content
+  & > div > p,
+  & > div > [data-cke-display-name="$content"] {
+    margin: 0;
+  }
 }
 
 .box, .plainmessage, // Used by: Code Macro, Success Macro, etc.
@@ -27,18 +69,26 @@ fieldset.xwikimessage { // Used by: Login form, Delete messages
 
 .successmessage {
   .alert-success;
+  background-color: @state-success-bg;
+  border-color: @brand-success;
 }
 
 .errormessage {
   .alert-danger;
+  background-color: @state-danger-bg;
+  border-color: @brand-danger;
 }
 
 .warningmessage {
   .alert-warning;
+  background-color: @state-warning-bg;
+  border-color: @brand-warning;
 }
 
 .infomessage {
   .alert-info;
+  background-color: @state-info-bg;
+  border-color: @brand-primary;
 }
 
 // --------------------------------------------------

xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-docker/src/test/it/org/xwiki/invitation/test/docker/InvitationIT.java

@@ -215,7 +215,7 @@ void sendMailToTwoAddresses() throws Exception
             assertMessageValid(messageB);
 
             // Check that the page has the table and the messages.
-            assertTrue(sent.getMessageBoxContent().contains("Your message has been sent."));
+            assertTrue(sent.getMessageBoxContent().contains("Information\nYour message has been sent."));
             TableElement table = sent.getTable();
             assertEquals(3, table.numberOfRows());
             assertEquals(3, table.numberOfColumns());
@@ -299,7 +299,7 @@ void unpermittedUserCannotSendToMultipleAddresses(TestUtils setup) throws Except
             getGreenMail().waitForIncomingEmail(2000, 2);
             MimeMessage[] messages = getGreenMail().getReceivedMessages();
             assertEquals(0, messages.length, "Messages were received when they shouldn't have been sent!");
-            assertEquals("Your message could not be sent because there were no valid email addresses to send to.",
+            assertEquals("Error\nYour message could not be sent because there were no valid email addresses to send to.",
                 sent.getMessageBoxContent(),
                 "User was not shown the correct error message.");
             stopGreenMail();
@@ -321,7 +321,7 @@ void unpermittedUserCannotSendToMultipleAddresses(TestUtils setup) throws Except
             getGreenMail().waitForIncomingEmail(10000, 2);
             messages = getGreenMail().getReceivedMessages();
             assertEquals(2, messages.length, "Non admins cannot send mail to even with permission");
-            assertEquals("Your message has been sent.", sent.getMessageBoxContent(),
+            assertEquals("Information\nYour message has been sent.", sent.getMessageBoxContent(),
                 "User was not given the message that their mail was sent.");
         } finally {
             stopGreenMail();
@@ -404,7 +404,7 @@ void spamReporting(TestUtils setup, LogCaptureConfiguration logCaptureConfigurat
                 "The message by the spam reporter is not shown to the admin.");
 
             String memo = "Actually the email lottery is quite legitimate.";
-            String expectedSuccessMessage = "Invitation successfully marked as not spam. Log entry: " + memo;
+            String expectedSuccessMessage = "Information\nInvitation successfully marked as not spam. Log entry: " + memo;
             // Return their sending privilege.
             String successMessage = inspect.notSpam("Actually the email lottery is quite legitimate.");
 
@@ -634,7 +634,7 @@ void cancelInvitation(TestUtils setup) throws Exception
                 confirm.getLabel().toLowerCase());
 
             confirm.setMemo("Sorry, wrong email address.");
-            assertEquals("Invitation successfully rescinded.", confirm.confirm());
+            assertEquals("Information\nInvitation successfully rescinded.", confirm.confirm());
 
             // Now switch to guest.
             setup.forceGuestUser();
@@ -646,13 +646,13 @@ void cancelInvitation(TestUtils setup) throws Exception
             InvitationGuestActionsPage guestPage =
                 InvitationGuestActionsPage.gotoPage(htmlMessage, InvitationGuestActionsPage.Action.ACCEPT);
             assertNotEquals("", guestPage.getMessage(), "Guest was able to accept a message which had been canceled.");
-            assertEquals("We're sorry but this invitation has been rescinded." + commonPart,
+            assertEquals("Error\nWe're sorry but this invitation has been rescinded." + commonPart,
                 guestPage.getMessage());
 
             // Prove that invitation cannot be declined
             guestPage = InvitationGuestActionsPage.gotoPage(htmlMessage, InvitationGuestActionsPage.Action.DECLINE);
             assertNotEquals("", guestPage.getMessage(), "Guest was able to decline a message which had been canceled.");
-            assertEquals("This invitation has been rescinded and thus cannot be declined." + commonPart,
+            assertEquals("Error\nThis invitation has been rescinded and thus cannot be declined." + commonPart,
                 guestPage.getMessage());
 
             // Prove that the message report spam page still shows up.

xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-pageobject/src/main/java/org/xwiki/invitation/test/po/InvitationFooterElement.java

@@ -70,7 +70,7 @@ public int myPendingInvitations()
         }
         String message = getDriver().findElementsWithoutWaiting(this.footer,
             By.id("my-pending-invitations")).get(0).getText().trim();
-        return Integer.parseInt(message.substring(0, message.indexOf(" pending")));
+        return Integer.parseInt(message.substring(message.indexOf("\n") + 1, message.indexOf(" pending")));
     }
 
     public int spamReports()
@@ -80,6 +80,6 @@ public int spamReports()
         }
         String message = getDriver().findElementsWithoutWaiting(this.footer,
             By.id("spam-reports")).get(0).getText().trim();
-        return Integer.parseInt(message.substring(0, message.indexOf(" reported as spam")));
+        return Integer.parseInt(message.substring(message.indexOf("\n") + 1, message.indexOf(" reported as spam")));
     }
 }

xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-pageobject/src/main/java/org/xwiki/invitation/test/po/InvitationSenderPage.java

@@ -68,7 +68,7 @@ public boolean userIsSpammer()
     {
         for (WebElement error : getDriver().findElementsWithoutWaiting(By.id("invitation-permission-error"))) {
             if (error.getText().equals(
-                "A message which you sent was reported as spam and your privilege to send mail has"
+                "Error\nA message which you sent was reported as spam and your privilege to send mail has"
                     + " been suspended pending investigation, we apologize for the inconvenience.")) {
                 return true;
             }

xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java

@@ -371,7 +371,7 @@ void inplaceEditableMacro(TestReference testReference, TestUtils setup, MultiUse
 
         // Save and check the result.
         ViewPage viewPage = secondEditPage.clickSaveAndView();
-        assertEquals("my info message\none two three", viewPage.getContent());
+        assertEquals("Information\nmy info message\none two three", viewPage.getContent());
     }
 
     @Test

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/pom.xml

@@ -111,6 +111,7 @@ Thus it is forbidden to depend on the HTML Macro.
     <module>xwiki-platform-rendering-macro-gallery</module>
     <module>xwiki-platform-rendering-macro-groovy</module>
     <module>xwiki-platform-rendering-macro-include</module>
+    <module>xwiki-platform-rendering-macro-message</module>
     <module>xwiki-platform-rendering-macro-python</module>
     <module>xwiki-platform-rendering-macro-script</module>
     <module>xwiki-platform-rendering-macro-toc</module>

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-message/pom.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * 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.
+-->
+
+<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>
+
+    <parent>
+        <groupId>org.xwiki.platform</groupId>
+        <artifactId>xwiki-platform-rendering-macros</artifactId>
+        <version>16.7.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>xwiki-platform-rendering-macro-message</artifactId>
+    <name>XWiki Platform - Rendering - Macro - Message</name>
+    <description>Extends the default message macro to provide translations.</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.xwiki.platform</groupId>
+            <artifactId>xwiki-platform-localization-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.xwiki.rendering</groupId>
+            <artifactId>xwiki-rendering-macro-message</artifactId>
+            <version>${rendering.version}</version>
+        </dependency>
+    </dependencies>
+</project>

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-message/src/main/java/org/xwiki/rendering/internal/macro/message/MacroIconPrettyNameProvider.java

@@ -0,0 +1,50 @@
+/*
+ * 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;
+import org.xwiki.localization.ContextualLocalizationManager;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * XWiki specific component to provide an alternative text for an icon.
+ *
+ * @version $Id$
+ * @since 16.7.0RC1
+ */
+@Component(roles = MacroIconPrettyNameProvider.class)
+@Singleton
+public class MacroIconPrettyNameProvider
+{
+    private static final String TRANSLATION_KEY_PREFIX = "rendering.macro.message.icon.alternative.";
+    @Inject
+    private ContextualLocalizationManager l10n;
+
+    /**
+     * @param macroId the id of the macro whose icon needs an alternative text
+     * @return the alternative text associated to the provided icon
+     */
+    public String getIconPrettyName(String macroId)
+    {
+        return l10n.getTranslationPlain(TRANSLATION_KEY_PREFIX + macroId);
+    }
+}

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-message/src/main/resources/META-INF/components.txt

@@ -0,0 +1 @@
+500:org.xwiki.rendering.internal.macro.message.MacroIconPrettyNameProvider

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml

@@ -109,6 +109,16 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-icon-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-localization-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <!--dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/util/XWikiIconProvider.java

@@ -0,0 +1,73 @@
+/*
+ * 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.util;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import org.xwiki.component.annotation.Component;
+import org.xwiki.icon.IconException;
+import org.xwiki.icon.IconRenderer;
+import org.xwiki.icon.IconSet;
+import org.xwiki.icon.IconSetManager;
+import org.xwiki.rendering.block.Block;
+import org.xwiki.rendering.block.RawBlock;
+import org.xwiki.rendering.syntax.Syntax;
+
+/**
+ * Component to use the icon theme to provide a proper block for displaying an icon.
+ *
+ * @version $Id$
+ * @since 16.7.0RC1
+ */
+@Component
+@Singleton
+public class XWikiIconProvider extends DefaultIconProvider
+{
+    @Inject
+    private IconSetManager iconSetManager;
+    @Inject
+    private IconRenderer iconRenderer;
+
+    /**
+     * Uses the icon theme to provide the right block for displaying an inline icon.
+     * @param iconName the name of the icon to display
+     * @return the block containing an icon.
+     */
+    @Override
+    public Block get(String iconName)
+    {
+        try {
+            IconSet iconSet = getIconSet(iconName);
+            String iconContent = this.iconRenderer.renderHTML(iconName, iconSet);
+            return new RawBlock(iconContent, Syntax.HTML_5_0);
+        } catch (IconException e) {
+            return super.get(iconName);
+        }
+    }
+
+    private IconSet getIconSet(String iconName) throws IconException
+    {
+        IconSet iconSet = this.iconSetManager.getCurrentIconSet();
+        if (iconSet == null || !iconSet.hasIcon(iconName)) {
+            iconSet = this.iconSetManager.getDefaultIconSet();
+        }
+        return iconSet;
+    }
+}

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/META-INF/components.txt

@@ -1,6 +1,7 @@
 500:org.xwiki.rendering.internal.renderer.XWikiAttachmentURILabelGenerator
 500:org.xwiki.rendering.internal.renderer.XWikiLinkLabelGenerator
 500:org.xwiki.rendering.internal.renderer.XWikiPageAttachmentURILabelGenerator
+500:org.xwiki.rendering.internal.util.XWikiIconProvider
 500:org.xwiki.rendering.internal.util.XWikiErrorBlockGenerator
 500:org.xwiki.rendering.internal.wiki.XWikiWikiModel
 500:org.xwiki.rendering.internal.macro.XWikiHTMLRawBlockFilter