From 43cf09c5447104b7b6de8e7a964a4ba3312a65a2 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Wed, 8 Nov 2023 18:08:46 +0100 Subject: [PATCH 01/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Updated style to take into account the addition of an icon in xwiki-rendering --- .../resources/flamingo/less/messages.less | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less index 72725e49e180..a729addbe597 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less +++ b/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,36 @@ // 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); +span.box { // Used by: Inline boxes + padding: 0 floor(@font-size-base * 0.2); + & > img { + // Style the icons of the message boxes + margin: 0 .5rem; + vertical-align: sub; + } +} + +div.successmessage, div.errormessage, div.warningmessage, div.infomessage { + // Used by: message boxes + display: flex; + align-items: center; + flex-wrap: wrap; + + & > p { + // Content of the message box + flex-grow: 1; + flex-basis: 98%; + } + + & > img { + // We need to do a hack with the flex because the title is not contained in its own node, + // it's just there in a textnode. + min-width: 2%; + max-height: 16px; + object-fit: contain; + } + } .box, .plainmessage, // Used by: Code Macro, Success Macro, etc. From 12d5de087e7f7df63ab0f6c6e6d98285a976dc08 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Thu, 9 Nov 2023 10:26:21 +0100 Subject: [PATCH 02/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Updated style to differentiate the title from the content of the box --- .../src/main/resources/flamingo/less/messages.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less index a729addbe597..8cba019ada6e 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less @@ -6,7 +6,7 @@ span.successmessage, span.errormessage, span.warningmessage, span.infomessage, span.box { // Used by: Inline boxes padding: 0 floor(@font-size-base * 0.2); & > img { - // Style the icons of the message boxes + // Style the icons for the inline boxes margin: 0 .5rem; vertical-align: sub; } @@ -17,11 +17,14 @@ div.successmessage, div.errormessage, div.warningmessage, div.infomessage { display: flex; align-items: center; flex-wrap: wrap; + // Increase font-weight only for the title (inline boxes don't display a title) + font-weight: bold; & > p { // Content of the message box flex-grow: 1; flex-basis: 98%; + font-weight: normal; } & > img { From 8959af0f904326daf31c8fb1fc8f2781f6eccd16 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Fri, 10 Nov 2023 16:09:20 +0100 Subject: [PATCH 03/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Updated style to align text in the box with a grid. Note: we don't know the exact height we want for this box (depends on content), so we can't use a column flexbox. --- .../resources/flamingo/less/messages.less | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less index 8cba019ada6e..8e50122b7365 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less @@ -14,27 +14,35 @@ span.box { // Used by: Inline boxes div.successmessage, div.errormessage, div.warningmessage, div.infomessage { // Used by: message boxes - display: flex; + display: inline-grid; + gap: .5rem; align-items: center; - flex-wrap: wrap; - // Increase font-weight only for the title (inline boxes don't display a title) - font-weight: bold; + padding-left: .5rem; + + & > img { + grid-row-start: 1; + grid-row-end: 3; + grid-column-start: 1; + grid-column-end: 2; + } & > p { - // Content of the message box - flex-grow: 1; - flex-basis: 98%; - font-weight: normal; + grid-row-start: 2; + grid-row-end: 3; + grid-column-start: 2; + grid-column-end: 3; } - & > img { - // We need to do a hack with the flex because the title is not contained in its own node, - // it's just there in a textnode. - min-width: 2%; - max-height: 16px; - object-fit: contain; + & > .box-title { + grid-row-start: 1; + grid-row-end: 2; + grid-column-start: 2; + grid-column-end: 3; + font-weight: bold; } + + } .box, .plainmessage, // Used by: Code Macro, Success Macro, etc. From 801d694dd70892e904dfbbfa8d399562c728dd17 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Fri, 10 Nov 2023 16:22:56 +0100 Subject: [PATCH 04/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Cleaned up style --- .../resources/flamingo/less/messages.less | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less index 8e50122b7365..3869ffaee5ee 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less @@ -2,8 +2,9 @@ // Messages // -------------------------------------------------- +// Used by: Inline boxes span.successmessage, span.errormessage, span.warningmessage, span.infomessage, -span.box { // Used by: Inline boxes +span.box { padding: 0 floor(@font-size-base * 0.2); & > img { // Style the icons for the inline boxes @@ -12,37 +13,26 @@ span.box { // Used by: Inline boxes } } +// Used by: message boxes div.successmessage, div.errormessage, div.warningmessage, div.infomessage { - // Used by: message boxes display: inline-grid; gap: .5rem; align-items: center; padding-left: .5rem; & > img { - grid-row-start: 1; - grid-row-end: 3; - grid-column-start: 1; - grid-column-end: 2; - } - - & > p { - grid-row-start: 2; - grid-row-end: 3; - grid-column-start: 2; - grid-column-end: 3; + grid-area: ~"1/1/3/2"; } & > .box-title { - grid-row-start: 1; - grid-row-end: 2; - grid-column-start: 2; - grid-column-end: 3; + grid-area: ~"1/2/2/3"; font-weight: bold; } - - + // Main message content + & > p { + grid-area: ~"2/2/3/3"; + } } .box, .plainmessage, // Used by: Code Macro, Success Macro, etc. From bfb4467ab40437e6a81f9c4646529d5f30272bf4 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Fri, 10 Nov 2023 16:39:51 +0100 Subject: [PATCH 05/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Updated padding and icon position for a cleaner presentation --- .../src/main/resources/flamingo/less/messages.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less index 3869ffaee5ee..f9b215a519dd 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less @@ -16,12 +16,13 @@ span.box { // Used by: message boxes div.successmessage, div.errormessage, div.warningmessage, div.infomessage { display: inline-grid; - gap: .5rem; + gap: .2rem .5rem; align-items: center; padding-left: .5rem; + padding-top: .5rem; & > img { - grid-area: ~"1/1/3/2"; + grid-area: ~"1/1/2/2"; } & > .box-title { From 8457d27c4fb7d59c3a9279c679fb894e9b9048d2 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Fri, 10 Nov 2023 16:50:53 +0100 Subject: [PATCH 06/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Fixed width of the boxes fitted to content and icon alignement --- .../src/main/resources/flamingo/less/messages.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less index f9b215a519dd..1f4c7a52b32a 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less @@ -15,14 +15,15 @@ span.box { // Used by: message boxes div.successmessage, div.errormessage, div.warningmessage, div.infomessage { - display: inline-grid; + display: grid; gap: .2rem .5rem; - align-items: center; + justify-content: left; padding-left: .5rem; padding-top: .5rem; & > img { grid-area: ~"1/1/2/2"; + align-self: center; } & > .box-title { From d6ed654e75edcd89361904d7997c2dd4ec3b3655 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Wed, 15 Nov 2023 11:20:01 +0100 Subject: [PATCH 07/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Fixed presentation for inplace editing --- .../src/main/resources/flamingo/less/messages.less | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less index 1f4c7a52b32a..d192b6edd649 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less @@ -26,13 +26,15 @@ div.successmessage, div.errormessage, div.warningmessage, div.infomessage { align-self: center; } - & > .box-title { + & > .box-title, + & > .xwiki-metadata-container[data-xwiki-parameter-name="title"] { grid-area: ~"1/2/2/3"; font-weight: bold; } // Main message content - & > p { + & > p, + & > [data-cke-display-name="$content"] { grid-area: ~"2/2/3/3"; } } From 1ea658a2d99f90acfa0acdc5fdfdfcf2fc61de92 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Tue, 12 Dec 2023 17:23:43 +0100 Subject: [PATCH 08/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Implementing the IconProvider interface to override xwiki-rendering behavior TODO: use a similar code to the icon nacro to provide the raw content of the block --- .../icon/XWikiIconProvider.java | 44 +++++++++++++++++++ .../main/resources/META-INF/components.txt | 1 + 2 files changed, 45 insertions(+) create mode 100644 xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java new file mode 100644 index 000000000000..b93664624878 --- /dev/null +++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java @@ -0,0 +1,44 @@ +/* + * 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.transformation.icon; + +import org.xwiki.component.annotation.Component; +import org.xwiki.rendering.block.Block; +import org.xwiki.rendering.block.NewLineBlock; + +import javax.inject.Singleton; + +/** + * Component to use the icon theme to provide a proper block for displaying an icon. + */ +@Component +@Singleton +public class XWikiIconProvider extends DefaultIconProvider +{ + /** + * Uses the icon theme to provide the right block for displaying an icon. + * @param iconName the name of the icon to display + * @return the block containing an icon. + */ + public Block get(String iconName) + { + return new RawBlock(rawContent, syntax); + } +} diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt index 6a52d57c7280..ca48db0b0799 100644 --- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt +++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt @@ -1 +1,2 @@ 500:org.xwiki.rendering.internal.transformation.icon.XWikiIconTransformationConfiguration +500:org.xwiki.rendering.transformation.icon.XWikiIconProvider \ No newline at end of file From cee7e328f34caeb2e45fc82b593dffdf96334f2e Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Wed, 13 Dec 2023 15:59:05 +0100 Subject: [PATCH 09/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Implemented an alternative to isntantiate icons in rendering * Updated the POM * Fixed the components.txt file Note: I decided to not factorize witht the code in the DisplayIconMacro because we don't need anything related to a parameter. --- .../pom.xml | 5 ++ .../icon/XWikiIconProvider.java | 53 ++++++++++++++++++- .../main/resources/META-INF/components.txt | 2 +- 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml index 621d4b8aaf1e..71420aa4068c 100644 --- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml +++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml @@ -46,5 +46,10 @@ ${commons.version} test + + org.xwiki.platform + xwiki-platform-icon-api + ${project.version} + diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java index b93664624878..83e1cae2ec6c 100644 --- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java +++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java @@ -20,25 +20,74 @@ package org.xwiki.rendering.internal.transformation.icon; 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.NewLineBlock; +import org.xwiki.rendering.block.ImageBlock; +import org.xwiki.rendering.block.RawBlock; +import org.xwiki.rendering.syntax.Syntax; +import javax.inject.Inject; import javax.inject.Singleton; +import java.util.ArrayList; +import java.util.List; /** * Component to use the icon theme to provide a proper block for displaying an icon. + * + * @version $Id$ + * @since 15.10.2 */ @Component @Singleton public class XWikiIconProvider extends DefaultIconProvider { + /* + We need to update the icon class in order to take into account the situations + where we fall back on the default behaviour (the current icon theme does not have + the requested icon). + */ + private static final List ICON_CLASS = new ArrayList(List.of(RawBlock.class, ImageBlock.class)); + + @Inject + private IconSetManager iconSetManager; + @Inject + private IconRenderer iconRenderer; + /** * Uses the icon theme to provide the right block for displaying an icon. * @param iconName the name of the icon to display * @return the block containing an icon. */ + @Override public Block get(String iconName) { - return new RawBlock(rawContent, syntax); + IconSet iconSet = null; + try { + 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); + } + } + + /** + * @return the java class of the icon block created. + */ + public List getIconClass() + { + return ICON_CLASS; + } + + private IconSet getIconSet(String iconName) throws IconException + { + IconSet iconSet = this.iconSetManager.getCurrentIconSet(); + if (iconSet == null || !iconSet.hasIcon(iconName)) { + iconSet = this.iconSetManager.getDefaultIconSet(); + } + return iconSet; } } diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt index ca48db0b0799..094d9f1e322a 100644 --- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt +++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt @@ -1,2 +1,2 @@ 500:org.xwiki.rendering.internal.transformation.icon.XWikiIconTransformationConfiguration -500:org.xwiki.rendering.transformation.icon.XWikiIconProvider \ No newline at end of file +org.xwiki.rendering.internal.transformation.icon.XWikiIconProvider From 0b9403e55755fffee272dfddc93ecf9ce378842c Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Wed, 13 Dec 2023 18:59:15 +0100 Subject: [PATCH 10/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Updated style to better match the previous proposal --- .../resources/flamingo/less/messages.less | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less index d192b6edd649..10061a36565f 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less @@ -3,39 +3,42 @@ // -------------------------------------------------- // Used by: Inline boxes -span.successmessage, span.errormessage, span.warningmessage, span.infomessage, -span.box { +span.successmessage, span.errormessage, span.warningmessage, span.infomessage { padding: 0 floor(@font-size-base * 0.2); & > img { - // Style the icons for the inline boxes - margin: 0 .5rem; + // Style the silk icons + margin: 0 .6rem; vertical-align: sub; } + + & > span.fa { + //Style the font awesome icons + margin: 0 .6rem; + } } // Used by: message boxes div.successmessage, div.errormessage, div.warningmessage, div.infomessage { - display: grid; - gap: .2rem .5rem; + display: flex; + gap: .2rem .6rem; justify-content: left; - padding-left: .5rem; - padding-top: .5rem; - + align-items: baseline; + padding: .5rem .8rem; + & > img { - grid-area: ~"1/1/2/2"; - align-self: center; + // Improve alignment for silk icons + align-self: flex-start; } - - & > .box-title, - & > .xwiki-metadata-container[data-xwiki-parameter-name="title"] { - grid-area: ~"1/2/2/3"; + + & > div > .box-title, + & > div > .xwiki-metadata-container[data-xwiki-parameter-name="title"] { font-weight: bold; } - + // Main message content - & > p, - & > [data-cke-display-name="$content"] { - grid-area: ~"2/2/3/3"; + & > div > p, + & > div > [data-cke-display-name="$content"] { + margin: 0; } } From 8b56a4c2f13c4c768bebb42dcb2fd1873220ff0a Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Thu, 14 Dec 2023 10:02:45 +0100 Subject: [PATCH 11/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Fixed codestyle and formatting --- .../src/main/resources/flamingo/less/messages.less | 2 +- .../pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less index 10061a36565f..c22e096d7bbb 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less @@ -12,7 +12,7 @@ span.successmessage, span.errormessage, span.warningmessage, span.infomessage { } & > span.fa { - //Style the font awesome icons + // Style the font awesome icons margin: 0 .6rem; } } diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml index 71420aa4068c..37939378f800 100644 --- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml +++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml @@ -46,10 +46,10 @@ ${commons.version} test - - org.xwiki.platform - xwiki-platform-icon-api - ${project.version} - + + org.xwiki.platform + xwiki-platform-icon-api + ${project.version} + From 3ecd6e6051c2e3671b2ec858cd4c99e0f17d034d Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Thu, 14 Dec 2023 10:40:20 +0100 Subject: [PATCH 12/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Added mapping for the transform icons to fontAwesome --- .../src/main/resources/IconThemes/FontAwesome.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml index f12f51c8a704..ae4426cb9d02 100644 --- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml +++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml @@ -288,7 +288,11 @@ disk = floppy-o drink = glass drive = hdd-o email = envelope-o -emoticon_smile=smile-o +emoticon_smile= smile-o +emoticon_grin = smile-o +emoticon_unhappy = frown-o +emoticon_tongue = smile-o +emoticon_wink = smile-o error = exclamation-triangle exclamation = exclamation-circle eye = eye From 2caaadf479c90111fb501c6714e4fb0b02663a6b Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Fri, 5 Jan 2024 15:44:09 +0100 Subject: [PATCH 13/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Reverted approximate mapping for the transform icons to fontAwesome --- .../src/main/resources/IconThemes/FontAwesome.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml index ae4426cb9d02..184c414827dc 100644 --- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml +++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml @@ -289,10 +289,7 @@ drink = glass drive = hdd-o email = envelope-o emoticon_smile= smile-o -emoticon_grin = smile-o emoticon_unhappy = frown-o -emoticon_tongue = smile-o -emoticon_wink = smile-o error = exclamation-triangle exclamation = exclamation-circle eye = eye From fcabab8f35bf2d791f2f544c29515139d8f89900 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Fri, 5 Jan 2024 15:50:48 +0100 Subject: [PATCH 14/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Increased component priority --- .../src/main/resources/META-INF/components.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt index 094d9f1e322a..c1784982d591 100644 --- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt +++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt @@ -1,2 +1,2 @@ 500:org.xwiki.rendering.internal.transformation.icon.XWikiIconTransformationConfiguration -org.xwiki.rendering.internal.transformation.icon.XWikiIconProvider +500:org.xwiki.rendering.internal.transformation.icon.XWikiIconProvider From 881845080154ed4b4c2d7d23b4051ed2eca48d92 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Mon, 8 Jan 2024 10:15:12 +0100 Subject: [PATCH 15/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Started reflecting changes from rendering --- .../internal/transformation/icon/XWikiIconProvider.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java index 83e1cae2ec6c..077dcf8fe1f7 100644 --- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java +++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon/XWikiIconProvider.java @@ -24,6 +24,7 @@ import org.xwiki.icon.IconRenderer; import org.xwiki.icon.IconSet; import org.xwiki.icon.IconSetManager; +import org.xwiki.icon.macro.internal.DisplayIconMacro; import org.xwiki.rendering.block.Block; import org.xwiki.rendering.block.ImageBlock; import org.xwiki.rendering.block.RawBlock; @@ -65,6 +66,7 @@ where we fall back on the default behaviour (the current icon theme does not hav public Block get(String iconName) { IconSet iconSet = null; + DisplayIconMacro iconMacro = new DisplayIconMacro(); try { iconSet = getIconSet(iconName); String iconContent = this.iconRenderer.renderHTML(iconName, iconSet); From d9063155e070d99a9dd7ab9b175fc298339ff9fb Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Wed, 10 Jan 2024 14:58:20 +0100 Subject: [PATCH 16/23] XWIKI-21452: Macros info, success, warning and error are only distinguished by colors * Updated position of the IconProvider to match the changes in rendering * Updated the return type of the iconProvider --- .../pom.xml | 5 ----- .../main/resources/META-INF/components.txt | 1 - .../xwiki-platform-rendering-xwiki/pom.xml | 5 +++++ .../transformation}/XWikiIconProvider.java | 19 ++++++++----------- .../main/resources/META-INF/components.txt | 1 + 5 files changed, 14 insertions(+), 17 deletions(-) rename xwiki-platform-core/xwiki-platform-rendering/{xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/java/org/xwiki/rendering/internal/transformation/icon => xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/transformation}/XWikiIconProvider.java (90%) diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml index 5c7b9903d672..466a794321bd 100644 --- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml +++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml @@ -46,10 +46,5 @@ ${commons.version} test - - org.xwiki.platform - xwiki-platform-icon-api - ${project.version} - diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt index c1784982d591..6a52d57c7280 100644 --- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt +++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/src/main/resources/META-INF/components.txt @@ -1,2 +1 @@ 500:org.xwiki.rendering.internal.transformation.icon.XWikiIconTransformationConfiguration -500:org.xwiki.rendering.internal.transformation.icon.XWikiIconProvider diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml index abc0ad755729..997fdcc6fdaa 100644 --- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml +++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml @@ -108,6 +108,11 @@ org.apache.httpcomponents httpclient + + org.xwiki.platform + xwiki-platform-icon-api + ${project.version} +