Zum Inhalt springen

Änderungen von Dokument Confluence bridge for Layout Section

Zuletzt geändert von Daniel Herrmann am 2025/12/16 11:18
Von Version Icon 6.1
bearbeitet von Daniel Herrmann
am 2025/12/16 11:18
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-confluence-bridges-ui/1.28.5]
Auf Version Icon 4.1 Icon
bearbeitet von Daniel Herrmann
am 2025/07/19 16:45
Änderungskommentar: Migrated property [contentOrder] from class [XWiki.WikiMacroClass]

Zusammenfassung

Details

Icon XWiki.StyleSheetExtension[0]
Code
... ... @@ -2,73 +2,107 @@
2 2   margin-bottom: 20px;
3 3  }
4 4  
5 -.macro-section, .macro-layout-section, .macro-layout-section > .xwiki-metadata-container.cke_widget_editable {
5 +.macro-section, .macro-layout-section {
6 6   display: flex;
7 7   flex-direction: row;
8 8   word-break: break-word;
9 9  }
10 -.macro-layout-section > .xwiki-metadata-container.cke_widget_editable {
10 +
11 +.macro-layout-section.single .macro-layout-cell {
11 11   flex-basis: 100%;
12 12  }
14 +.macro-layout-section.two_equal .macro-layout-cell {
15 + flex-basis: 50%;
16 +}
17 +.macro-layout-section.three_equal .macro-layout-cell {
18 + flex-basis: 33.33%;
19 +}
20 +.macro-layout-section.two_right_sidebar {
21 + .macro-layout-cell {
22 + flex-basis: 33.33%;
23 + }
24 + .macro-layout-cell:first-child {
25 + flex-basis: 66.66%;
26 + }
27 +}
28 +.macro-layout-section.two_left_sidebar {
29 + .macro-layout-cell {
30 + flex-basis: 66.66%;
31 + }
32 + .macro-layout-cell:first-child {
33 + flex-basis: 33.33%;
34 + }
35 +}
36 +.macro-layout-section.three_with_sidebars {
37 + .macro-layout-cell {
38 + flex-basis: 25%;
39 + }
40 + .macro-layout-cell:nth-child(2) {
41 + flex-basis: 50%;
42 + }
43 +}
44 +.macro-layout-section {
45 + margin-bottom: 20px;
46 +}
13 13  
14 -.macro-layout-section.single .macro-layout-cell, .macro-layout-section.single .cke_widget_wrapper:has(.macro-layout-cell) {
48 +.macro-layout-section.single .macro-layout-cell {
15 15   flex-basis: 100%;
16 16  }
17 -.macro-layout-section.two_equal .macro-layout-cell, .macro-layout-section.two_equal .cke_widget_wrapper:has(.macro-layout-cell) {
51 +.macro-layout-section.two_equal .macro-layout-cell {
18 18   flex-basis: 50%;
19 19  }
20 -.macro-layout-section.three_equal .macro-layout-cell, .macro-layout-section.three_equal .cke_widget_wrapper:has(.macro-layout-cell) {
54 +.macro-layout-section.three_equal .macro-layout-cell {
21 21   flex-basis: 33.33%;
22 22  }
23 23  
24 -.macro-layout-section.four_equal .macro-layout-cell, .macro-layout-section.four_equal .cke_widget_wrapper:has(.macro-layout-cell) {
58 +.macro-layout-section.four_equal .macro-layout-cell {
25 25   flex-basis: 25%;
26 26  }
27 27  
28 -.macro-layout-section.five_equal .macro-layout-cell, .macro-layout-section.five_equal .cke_widget_wrapper:has(.macro-layout-cell) {
62 +.macro-layout-section.five_equal .macro-layout-cell {
29 29   flex-basis: 20%;
30 30  }
31 31  
32 32  .macro-layout-section.two_right_sidebar {
33 - .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
67 + .macro-layout-cell {
34 34   flex-basis: 33.33%;
35 35   }
36 - .macro-layout-cell:first-child, .cke_widget_wrapper:has(.macro-layout-cell):first-child {
70 + .macro-layout-cell:first-child {
37 37   flex-basis: 66.66%;
38 38   }
39 39  }
40 40  .macro-layout-section.two_left_sidebar {
41 - .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
75 + .macro-layout-cell {
42 42   flex-basis: 66.66%;
43 43   }
44 - .macro-layout-cell:first-child, .cke_widget_wrapper:has(.macro-layout-cell):first-child {
78 + .macro-layout-cell:first-child {
45 45   flex-basis: 33.33%;
46 46   }
47 47  }
48 48  
49 49  .macro-layout-section.three_with_sidebars {
50 - .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
84 + .macro-layout-cell {
51 51   flex-basis: 25%;
52 52   }
53 - .macro-layout-cell:nth-child(2), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(2) {
87 + .macro-layout-cell:nth-child(2) {
54 54   flex-basis: 50%;
55 55   }
56 56  }
57 57  
58 58  .macro-layout-section.three_right_sidebars {
59 - .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
93 + .macro-layout-cell {
60 60   flex-basis: 25%;
61 61   }
62 - .macro-layout-cell:nth-child(3), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(3) {
96 + .macro-layout-cell:nth-child(3) {
63 63   flex-basis: 50%;
64 64   }
65 65  }
66 66  
67 67  .macro-layout-section.three_left_sidebars {
68 - .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
102 + .macro-layout-cell {
69 69   flex-basis: 25%;
70 70   }
71 - .macro-layout-cell:nth-child(1), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(1) {
105 + .macro-layout-cell:nth-child(1) {
72 72   flex-basis: 50%;
73 73   }
74 74  }
Icon XWiki.WikiMacroClass[0]
Makro-Code
... ... @@ -17,7 +17,7 @@
17 17  ## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
18 18  ## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
19 19  ## don't have view right on those pages.
20 -#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
20 +#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
21 21   #executeMacro
22 22  #else
23 23   {{missingLicenseMessage extensionName="proMacros.extension.name"/}}