Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 73.13
edited by Benjamin Fischer
on 2024/11/07 17:19
Change comment: There is no comment for this version
To version 73.18
edited by Benjamin Fischer
on 2024/11/08 13:58
Change comment: There is no comment for this version

Summary

Details

XWiki.JavaScriptExtension[0]
Code
... ... @@ -51,6 +51,13 @@
51 51   head.push(E("th", {colspan}, ms.format(cf)));
52 52  
53 53   const bgc = new Array(md);
54 + let scc = [];
55 + let scu = [];
56 + const scs = col => el => {
57 + const step = 100 / scc.length;
58 + el.style.left = `${col * step}%`;
59 + el.style.width = `${step}%`;
60 + };
54 54  
55 55   for (const day of range(31)) {
56 56   if (day < md) {
... ... @@ -74,10 +74,22 @@
74 74   if (v.start.isBefore(ms)) e.classList.add("fc-cut-start");
75 75   if (me.isBefore(v.end)) e.classList.add("fc-cut-end");
76 76   oc.push(e);
77 - // TODO: soft-columns
84 + const i = scu.indexOf(0);
85 + if (i < 0) {
86 + scc.push([e]);
87 + scu.push(d);
88 + scc.forEach((els, col) => els.forEach(scs(col)));
89 + } else {
90 + scc[i].push(e);
91 + scu[i] = d;
92 + scs(i)(e);
93 + }
78 78   }
79 79   }
80 80  
97 + scu = scu.map(u => Math.max(0, u - 1));
98 + if (!scu.some()) {scc = []; scu = [];}
99 +
81 81   const style = bgc[day] && `background-color: ${bgc[day]};`;
82 82   const dc = this.getDayClasses(ds);
83 83   const da = sub => ({class: dc.concat(sub).join(" "), style});
... ... @@ -134,7 +134,6 @@
134 134   firstDay: "1",
135 135   minTime: "8:00",
136 136   maxTime: "23:00",
137 - defaultDate: "2024-11-06",
138 138   editable: false,
139 139   eventDataTransform: event => {
140 140   if (event.url.split("/")[4] === "Holidays") event.rendering = "background";
XWiki.StyleSheetExtension[0]
Code
... ... @@ -13,7 +13,6 @@
13 13   }
14 14   tbody.fc-body {
15 15   td {
16 - background-color: #fff;
17 17   &.fc-sat, &.fc-sun {
18 18   background-color: @weekend-color;
19 19   &.fc-dayVal {
... ... @@ -28,7 +28,7 @@
28 28   border-top: 1px solid #bbb;
29 29   }
30 30   tr:hover > th {
31 - filter: brightness(0.8);
30 + background-color: #ccc;
32 32   }
33 33   td.fc-mainVal {
34 34   position: relative;
... ... @@ -47,7 +47,7 @@
47 47   border-bottom-right-radius: 0px;
48 48   }
49 49   &:hover {
50 - width: auto;
49 + width: auto !important;
51 51   max-width: 10vw;
52 52   height: auto !important;
53 53   z-index: 10;
... ... @@ -62,7 +62,11 @@
62 62   td.fc-dayVal, td.fc-weekVal {
63 63   color: desaturate(lighten(#1D3B58, 50%), 80%);
64 64   }
64 + td.fc-dayVal {
65 + font-size: small;
66 + }
65 65   td.fc-weekVal {
68 + font-size: smaller;
66 66   text-align: right;
67 67   }
68 68   }