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