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 2.1 Icon
bearbeitet von Daniel Herrmann
am 2025/06/23 20:09
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-confluence-bridges-ui/1.26.20]
Auf 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]

Zusammenfassung

Details

Icon XWiki.StyleSheetExtension[0]
Code
... ... @@ -2,107 +2,73 @@
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 8   word-break: break-word;
9 9  }
10 -
11 -.macro-layout-section.single .macro-layout-cell {
10 +.macro-layout-section > .xwiki-metadata-container.cke_widget_editable {
12 12   flex-basis: 100%;
13 13  }
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 -}
47 47  
48 -.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) {
49 49   flex-basis: 100%;
50 50  }
51 -.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) {
52 52   flex-basis: 50%;
53 53  }
54 -.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) {
55 55   flex-basis: 33.33%;
56 56  }
57 57  
58 -.macro-layout-section.four_equal .macro-layout-cell {
24 +.macro-layout-section.four_equal .macro-layout-cell, .macro-layout-section.four_equal .cke_widget_wrapper:has(.macro-layout-cell) {
59 59   flex-basis: 25%;
60 60  }
61 61  
62 -.macro-layout-section.five_equal .macro-layout-cell {
28 +.macro-layout-section.five_equal .macro-layout-cell, .macro-layout-section.five_equal .cke_widget_wrapper:has(.macro-layout-cell) {
63 63   flex-basis: 20%;
64 64  }
65 65  
66 66  .macro-layout-section.two_right_sidebar {
67 - .macro-layout-cell {
33 + .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
68 68   flex-basis: 33.33%;
69 69   }
70 - .macro-layout-cell:first-child {
36 + .macro-layout-cell:first-child, .cke_widget_wrapper:has(.macro-layout-cell):first-child {
71 71   flex-basis: 66.66%;
72 72   }
73 73  }
74 74  .macro-layout-section.two_left_sidebar {
75 - .macro-layout-cell {
41 + .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
76 76   flex-basis: 66.66%;
77 77   }
78 - .macro-layout-cell:first-child {
44 + .macro-layout-cell:first-child, .cke_widget_wrapper:has(.macro-layout-cell):first-child {
79 79   flex-basis: 33.33%;
80 80   }
81 81  }
82 82  
83 83  .macro-layout-section.three_with_sidebars {
84 - .macro-layout-cell {
50 + .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
85 85   flex-basis: 25%;
86 86   }
87 - .macro-layout-cell:nth-child(2) {
53 + .macro-layout-cell:nth-child(2), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(2) {
88 88   flex-basis: 50%;
89 89   }
90 90  }
91 91  
92 92  .macro-layout-section.three_right_sidebars {
93 - .macro-layout-cell {
59 + .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
94 94   flex-basis: 25%;
95 95   }
96 - .macro-layout-cell:nth-child(3) {
62 + .macro-layout-cell:nth-child(3), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(3) {
97 97   flex-basis: 50%;
98 98   }
99 99  }
100 100  
101 101  .macro-layout-section.three_left_sidebars {
102 - .macro-layout-cell {
68 + .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
103 103   flex-basis: 25%;
104 104   }
105 - .macro-layout-cell:nth-child(1) {
71 + .macro-layout-cell:nth-child(1), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(1) {
106 106   flex-basis: 50%;
107 107   }
108 108  }
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.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
20 +#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
21 21   #executeMacro
22 22  #else
23 23   {{missingLicenseMessage extensionName="proMacros.extension.name"/}}