Zum Inhalt springen

Änderungen von Dokument Confluence bridge for Layout Section

Zuletzt geändert von xwikiadmin am 2025/12/11 07:49
Von Version 3.1
bearbeitet von xwikiadmin
am 2025/05/21 09:24
Änderungskommentar: Migrated property [feature] from class [XWiki.WikiMacroParameterClass]
Auf Version 6.1
bearbeitet von xwikiadmin
am 2025/12/11 07:49
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-confluence-bridges-ui/1.28.5]

Zusammenfassung

Details

XWiki.StyleSheetExtension[0]
Code
... ... @@ -2,45 +2,77 @@
2 2   margin-bottom: 20px;
3 3  }
4 4  
5 -.macro-section, .macro-layout-section {
5 +.macro-section, .macro-layout-section, .macro-layout-section > .xwiki-metadata-container.cke_widget_editable {
6 6   display: flex;
7 7   flex-direction: row;
8 + word-break: break-word;
8 8  }
10 +.macro-layout-section > .xwiki-metadata-container.cke_widget_editable {
11 + flex-basis: 100%;
12 +}
9 9  
10 -.macro-layout-section.single .macro-layout-cell {
14 +.macro-layout-section.single .macro-layout-cell, .macro-layout-section.single .cke_widget_wrapper:has(.macro-layout-cell) {
11 11   flex-basis: 100%;
12 12  }
13 -.macro-layout-section.two_equal .macro-layout-cell {
17 +.macro-layout-section.two_equal .macro-layout-cell, .macro-layout-section.two_equal .cke_widget_wrapper:has(.macro-layout-cell) {
14 14   flex-basis: 50%;
15 15  }
16 -.macro-layout-section.three_equal .macro-layout-cell {
20 +.macro-layout-section.three_equal .macro-layout-cell, .macro-layout-section.three_equal .cke_widget_wrapper:has(.macro-layout-cell) {
17 17   flex-basis: 33.33%;
18 18  }
23 +
24 +.macro-layout-section.four_equal .macro-layout-cell, .macro-layout-section.four_equal .cke_widget_wrapper:has(.macro-layout-cell) {
25 + flex-basis: 25%;
26 +}
27 +
28 +.macro-layout-section.five_equal .macro-layout-cell, .macro-layout-section.five_equal .cke_widget_wrapper:has(.macro-layout-cell) {
29 + flex-basis: 20%;
30 +}
31 +
19 19  .macro-layout-section.two_right_sidebar {
20 - .macro-layout-cell {
33 + .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
21 21   flex-basis: 33.33%;
22 22   }
23 - .macro-layout-cell:first-child {
36 + .macro-layout-cell:first-child, .cke_widget_wrapper:has(.macro-layout-cell):first-child {
24 24   flex-basis: 66.66%;
25 25   }
26 26  }
27 27  .macro-layout-section.two_left_sidebar {
28 - .macro-layout-cell {
41 + .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
29 29   flex-basis: 66.66%;
30 30   }
31 - .macro-layout-cell:first-child {
44 + .macro-layout-cell:first-child, .cke_widget_wrapper:has(.macro-layout-cell):first-child {
32 32   flex-basis: 33.33%;
33 33   }
34 34  }
48 +
35 35  .macro-layout-section.three_with_sidebars {
36 - .macro-layout-cell {
50 + .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
37 37   flex-basis: 25%;
38 38   }
39 - .macro-layout-cell:nth-child(2) {
53 + .macro-layout-cell:nth-child(2), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(2) {
40 40   flex-basis: 50%;
41 41   }
42 42  }
43 43  
58 +.macro-layout-section.three_right_sidebars {
59 + .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
60 + flex-basis: 25%;
61 + }
62 + .macro-layout-cell:nth-child(3), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(3) {
63 + flex-basis: 50%;
64 + }
65 +}
66 +
67 +.macro-layout-section.three_left_sidebars {
68 + .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
69 + flex-basis: 25%;
70 + }
71 + .macro-layout-cell:nth-child(1), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(1) {
72 + flex-basis: 50%;
73 + }
74 +}
75 +
44 44  .macro-layout-section {
45 45   gap: 32px;
46 46   h1, h2, h3, h4, h5, h6 {
... ... @@ -48,3 +48,10 @@
48 48   }
49 49  }
50 50  
83 +.macro-layout-section {
84 + gap: 32px;
85 + h1, h2, h3, h4, h5, h6 {
86 + margin: 0;
87 + }
88 +}
89 +
XWiki.WikiMacroClass[0]
Makro-Code
... ... @@ -1,7 +1,7 @@
1 1  {{velocity output="false"}}
2 2  #macro (executeMacro)
3 3   #set ($discard = $xwiki.ssx.use('Confluence.Macros.ConfluenceLayoutSection'))
4 - #set ($cssLayoutClass = $xcontext.macro.params.get('ac:type'))
4 + #set ($cssLayoutClass = $services.rendering.escape("$!xcontext.macro.params.get('ac:type')", 'xwiki/2.1'))
5 5   (% class="macro-layout-section $cssLayoutClass" %)(((
6 6   ## Since 11.5 the content of the macro can be edited in WYSIWYG editor.
7 7   #if ($services.rendering.getMacroDescriptor($services.rendering.resolveMacroId('wikimacrocontent')))