Änderungen von Dokument Panel Macro
Zuletzt geändert von xwikiadmin am 2025/01/07 12:27
Von Version 6.1
bearbeitet von xwikiadmin
am 2025/01/07 12:27
am 2025/01/07 12:27
Änderungskommentar:
Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.25.4]
Auf Version 5.1
bearbeitet von xwikiadmin
am 2024/06/24 15:04
am 2024/06/24 15:04
Änderungskommentar:
Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.19.4]
Zusammenfassung
-
Seiteneigenschaften (1 geändert, 0 hinzugefügt, 0 gelöscht)
-
Objekte (2 geändert, 0 hinzugefügt, 4 gelöscht)
Details
- Seiteneigenschaften
-
- Inhalt
-
... ... @@ -7,20 +7,16 @@ 7 7 8 8 |= Parameter |= Name |= Default value |= Description 9 9 | title | $services.localization.render('rendering.macro.panel.parameter.title.name') | - | $services.localization.render('rendering.macro.panel.parameter.title.description') 10 -| footer | $services.localization.render('rendering.macro.panel.parameter.footer.name') | - | $services.localization.render('rendering.macro.panel.parameter.footer.description') 11 11 | bgColor | $services.localization.render('rendering.macro.panel.parameter.bgColor.name') | - | $services.localization.render('rendering.macro.panel.parameter.bgColor.description') 12 12 | contentTextColor | $services.localization.render('rendering.macro.panel.parameter.contentTextColor.name') | - | $services.localization.render('rendering.macro.panel.parameter.contentTextColor.description') 13 13 | width | $services.localization.render('rendering.macro.panel.parameter.width.name') | - | $services.localization.render('rendering.macro.panel.parameter.width.description') 14 -| height | $services.localization.render('rendering.macro.panel.parameter.height.name') | - | $services.localization.render('rendering.macro.panel.parameter.height.description') 15 15 | classes | $services.localization.render('rendering.macro.panel.parameter.classes.name') | - | $services.localization.render('rendering.macro.panel.parameter.classes.description') 16 16 | borderColor | $services.localization.render('rendering.macro.panel.parameter.borderColor.name') |white| $services.localization.render('rendering.macro.panel.parameter.borderColor.description') 17 17 | borderStyle | $services.localization.render('rendering.macro.panel.parameter.borderStyle.name') |solid | $services.localization.render('rendering.macro.panel.parameter.borderStyle.description') 18 18 | borderWidth| $services.localization.render('rendering.macro.panel.parameter.borderWidth.name') |1px| $services.localization.render('rendering.macro.panel.parameter.borderWidth.description') 19 -| borderRadius| $services.localization.render('rendering.macro.panel.parameter.borderRadius.name')|8px 8px 0px 0px or 8px 8px 8px 8px if the footer is present| $services.localization.render('rendering.macro.panel.parameter.borderRadius.description')17 +| borderRadius| $services.localization.render('rendering.macro.panel.parameter.borderRadius.name')|8px 8px 0px 0px| $services.localization.render('rendering.macro.panel.parameter.borderRadius.description') 20 20 | titleBGColor | $services.localization.render('rendering.macro.panel.parameter.titleBGColor.name') | - | $services.localization.render('rendering.macro.panel.parameter.titleBGColor.description') 21 21 | titleColor | $services.localization.render('rendering.macro.panel.parameter.titleColor.name') | - | $services.localization.render('rendering.macro.panel.parameter.titleColor.description') 22 -| footerBGColor | $services.localization.render('rendering.macro.panel.parameter.footerBGColor.name') | - | $services.localization.render('rendering.macro.panel.parameter.footerBGColor.description') 23 -| footerColor | $services.localization.render('rendering.macro.panel.parameter.footerColor.name') | - | $services.localization.render('rendering.macro.panel.parameter.footerColor.description') 24 24 {{/velocity}} 25 25 26 26 = Examples = ... ... @@ -37,15 +37,15 @@ 37 37 Content of the panel 38 38 {{/panel}} 39 39 40 -== Panel with title ,content, footerand colors ==36 +== Panel with title and colors == 41 41 42 -{{panel bgColor="#dbf4ff" titleBGColor="#2a8af7" titleColor="#ffffff" width="50%" footerBGColor="#2a8af7" footerColor="#faafff" title="Title of the panel"footer="Footer of the panel"}}38 +{{panel bgColor="#dbf4ff" titleBGColor="#2a8af7" titleColor="#ffffff" width="50%" title="Title of the panel"}} 43 43 Content of the panel 44 44 {{/panel}} 45 45 46 46 == Panel with title and colors and border == 47 47 48 -{{panel b orderColor="#2a8af7" bgColor="#dbf4ff" titleBGColor="#2a8af7" titleColor="#ffffff" title="Title of the panel"}}44 +{{panel bgColor="#dbf4ff" borderColor="#2a8af7" titleBGColor="#2a8af7" titleColor="#ffffff" title="Title of the panel"}} 49 49 Content of the panel 50 50 {{/panel}} 51 51 ... ... @@ -55,11 +55,11 @@ 55 55 Content of the panel 56 56 {{/panel}} 57 57 58 -{{panel bgColor="#dbf4ff" titleBGColor="#2a8af7" titleColor="#ffffff" classes="col-sm-6"title="Title of the panel"}}54 +{{panel classes="col-sm-6" bgColor="#dbf4ff" titleBGColor="#2a8af7" titleColor="#ffffff" title="Title of the panel"}} 59 59 Content of the panel 60 60 {{/panel}} 61 61 62 -{{panel bgColor="#dbf4ff" titleBGColor="#2a8af7" titleColor="#ffffff" classes="col-sm-6"title="Title of the panel"}}58 +{{panel classes="col-sm-6" bgColor="#dbf4ff" titleBGColor="#2a8af7" titleColor="#ffffff" title="Title of the panel"}} 63 63 Content of the panel 64 64 {{/panel}} 65 65
- XWiki.StyleSheetExtension[0]
-
- Code
-
... ... @@ -1,4 +2,3 @@ 1 -.macro-panel-footer, 2 2 .macro-panel-title, 3 3 .macro-panel-content { 4 4 padding: 10px 10px 1px 10px; ... ... @@ -10,7 +10,6 @@ 10 10 11 11 /*default border style*/ 12 12 .macro-panel.macro-border, .macro-panel > .macro-border { 13 - display: grid; 14 14 border-color: transparent; 15 15 border-width: 1px; 16 16 border-style: solid; ... ... @@ -17,11 +17,6 @@ 17 17 border-radius: 8px 8px 0px 0px; 18 18 } 19 19 20 -.macro-panel.macro-border:has(.macro-panel-footer) 21 -{ 22 - border-radius: 8px 8px 8px 8px; 23 -} 24 - 25 25 /* style for the excerpt-include macro */ 26 26 .macro-excerpt-include.macro-panel > .macro-border { 27 27 border: 1px solid; ... ... @@ -34,7 +34,3 @@ 34 34 .macro-excerpt-include.macro-panel > .macro-border > .macro-panel-content { 35 35 padding-bottom: 1ex; 36 36 } 37 - 38 -.macro-excerpt-include.macro-panel > .macro-border > .macro-panel-footer { 39 - padding-bottom: 1ex; 40 -}
- XWiki.WikiMacroClass[0]
-
- Makro-Code
-
... ... @@ -11,19 +11,12 @@ 11 11 #set ($titleBGColor = "$!xcontext.macro.params.titleBGColor") 12 12 #set ($titleColor = "$!xcontext.macro.params.titleColor") 13 13 #set ($width = "$!xcontext.macro.params.width") 14 - #set ($height = "$!xcontext.macro.params.height") 15 15 #set ($classes = "$!xcontext.macro.params.classes") 16 - #set ($panelFooter = "$!xcontext.macro.params.footer") 17 - #set ($footerBGColor = "$!xcontext.macro.params.footerBGColor") 18 - #set ($footerColor = "$!xcontext.macro.params.footerColor") 19 19 ## Panel border style 20 20 #set ($panelBorderStyle = '') 21 21 #if ($width != '') 22 22 #set ($panelBorderStyle = "${panelBorderStyle}width: $width; ") 23 23 #end 24 - #if ($height != '') 25 - #set ($panelBorderStyle = "${panelBorderStyle}height: $height; ") 26 - #end 27 27 #if ($borderStyle != '') 28 28 #set ($panelBorderStyle = "${panelBorderStyle}border: $borderStyle; ") 29 29 #end ... ... @@ -44,14 +44,6 @@ 44 44 #if ($titleColor != '') 45 45 #set ($panelTitleStyle = "${panelTitleStyle}color: $titleColor; ") 46 46 #end 47 - ## Panel footer style. 48 - #set ($panelFooterStyle = '') 49 - #if ($footerBGColor != '') 50 - #set ($panelFooterStyle = "${panelFooterStyle}background-color: $footerBGColor; ") 51 - #end 52 - #if ($footerColor != '') 53 - #set ($panelFooterStyle = "${panelFooterStyle}color: $footerColor; ") 54 - #end 55 55 ## Panel content style. 56 56 #set ($panelContentStyle = '') 57 57 #if ($bgColor != '') ... ... @@ -73,21 +73,26 @@ 73 73 #else 74 74 #set ($macroBorderClass = "$macroBorderClass macro-panel") 75 75 #end 76 - (% class="$macroBorderClass" style="$ services.rendering.escape($panelBorderStyle, 'xwiki/2.1')" %)(((61 + (% class="$macroBorderClass" style="$panelBorderStyle" %)((( 77 77 #if( $panelTitle != '') 78 - (% class="macro-panel-title" style="$services.rendering.escape($panelTitleStyle, 'xwiki/2.1')"%)((( 79 - {{wikimacroparameter name="title" /}} 80 - ))) 81 - #end 82 - (% class="macro-panel-content" style="$services.rendering.escape($panelContentStyle, 'xwiki/2.1')"%)((( 83 - {{wikimacrocontent /}} 84 - ))) 85 - #if( $panelFooter != '') 86 - (% class="macro-panel-footer" style="$services.rendering.escape($panelFooterStyle, 'xwiki/2.1')"%)((( 63 + (% class="macro-panel-title" style="$panelTitleStyle"%)((( 87 87 ## Since 11.5 the content of the macro can be edited in WYSIWYG editor. 88 - {{wikimacroparameter name="footer" /}} 65 + #if ($services.rendering.getMacroDescriptor($services.rendering.resolveMacroId('wikimacroparameter'))) 66 + {{wikimacroparameter name="title" /}} 67 + #else 68 + $panelTitle 69 + #end 89 89 ))) 90 90 #end 72 + (% class="macro-panel-content" style="$panelContentStyle"%)((( 73 + ## Since 11.5 the content of the macro can be edited in WYSIWYG editor. 74 + #if ($services.rendering.getMacroDescriptor($services.rendering.resolveMacroId('wikimacrocontent'))) 75 + {{wikimacrocontent /}} 76 + #else 77 + $!xcontext.macro.content 78 + #end 79 + ))) 80 + ))) 91 91 #if ("$!classes" != '') 92 92 ))) 93 93 #end
- XWiki.WikiMacroParameterClass[12]
-
- Parameter-Name
-
... ... @@ -1,1 +1,0 @@ 1 -footerBGColor - Parameter verpflichtend
-
... ... @@ -1,1 +1,0 @@ 1 -Nein
- XWiki.WikiMacroParameterClass[13]
-
- Parameter-Name
-
... ... @@ -1,1 +1,0 @@ 1 -footer - Parameter verpflichtend
-
... ... @@ -1,1 +1,0 @@ 1 -Nein
- XWiki.WikiMacroParameterClass[14]
-
- Parameter-Name
-
... ... @@ -1,1 +1,0 @@ 1 -footerColor - Parameter verpflichtend
-
... ... @@ -1,1 +1,0 @@ 1 -Nein
- XWiki.WikiMacroParameterClass[15]
-
- Parameter-Name
-
... ... @@ -1,1 +1,0 @@ 1 -height - Parameter verpflichtend
-
... ... @@ -1,1 +1,0 @@ 1 -Nein