Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20

From version 73.5
edited by Benjamin Fischer
on 2024/11/07 16:57
Change comment: There is no comment for this version
To version 73.14
edited by Benjamin Fischer
on 2024/11/08 10:38
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});
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,9 +1,7 @@
1 +@weekend-color: #f5f5f5;
1 1  #calendarCustom.fc {
2 2   td.fc-sat, td.fc-sun {
3 - background-color: #f5f5f5;
4 - &.fc-dayVal {
5 - background-color: #f5f5f5 !important;
6 - }
4 + background-color: @weekend-color;
7 7   }
8 8   .fc-month-cols-view > table {
9 9   table-layout: auto;
... ... @@ -13,7 +13,16 @@
13 13   col.fc-fitCol {
14 14   width: 1px;
15 15   }
16 - .fc-body {
14 + tbody.fc-body {
15 + td {
16 + background-color: #fff;
17 + &.fc-sat, &.fc-sun {
18 + background-color: @weekend-color;
19 + &.fc-dayVal {
20 + background-color: @weekend-color !important;
21 + }
22 + }
23 + }
17 17   tr:nth-child(4n+3) > * {
18 18   border-top: 1px solid #ddd;
19 19   }
... ... @@ -20,8 +20,8 @@
20 20   tr:nth-child(4n+5) > * {
21 21   border-top: 1px solid #bbb;
22 22   }
23 - tr:hover {
24 - filter: brightness(0.95);
30 + tr:hover > th {
31 + filter: brightness(0.8);
25 25   }
26 26   td.fc-mainVal {
27 27   position: relative;