Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.70
edited by Benjamin Fischer
on 2024/11/07 13:15
Change comment: There is no comment for this version
To version 72.76
edited by Benjamin Fischer
on 2024/11/07 13:41
Change comment: There is no comment for this version

Summary

Details

XWiki.JavaScriptExtension[0]
Code
... ... @@ -35,7 +35,6 @@
35 35   const ye = this.end;
36 36   const yv = events.slice().sort((a,b) => a.start.diff(b.start) || a.end.diff(b.end));
37 37  
38 -
39 39   const cols = [];
40 40   const head = [];
41 41   const days = Array(31).fill().map(_ => []);
... ... @@ -52,9 +52,9 @@
52 52   const md = me.diff(ms, "days");
53 53   const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
54 54  
55 - if (df) cols.push(E("col", {class: "fc-fitCol fc-fade fc-dayVal"}));
56 - cols.push(E("col"));
57 - if (wf) cols.push(E("col", {class: "fc-fitCol fc-fade fc-weekVal"}));
54 + if (df) cols.push(E("col", {class: "fc-fitCol fc-fade fc-borderLeft"}));
55 + cols.push(E("col", {class: df ? null : "fc-borderLeft"}));
56 + if (wf) cols.push(E("col", {class: "fc-fitCol fc-fade"}));
58 58   head.push(E("th", {colspan}, ms.format(cf)));
59 59  
60 60   const bgc = new Array(md);
... ... @@ -82,14 +82,12 @@
82 82   }
83 83   }
84 84  
85 - const da = {class: this.getDayClasses(ds).join(" ")};
86 - if (df) days[day].push(E("td", da, ds.format(df)));
87 - if (bgc[day]) da.style = `background-color: ${bgc[day]};`;
88 - days[day].push(E("td", da, oc));
89 - if (wf) {
90 - da.class += " fc-weekVal";
91 - days[day].push(E("td", da, ds.weekday() ? "" : ds.format(wf)));
92 - }
84 + const style = bgc[day] && `background-color: ${bgc[day]};`;
85 + const dc = this.getDayClasses(ds);
86 + const da = sub => ({class: dc.concat(sub).join(" "), style});
87 + if (df) days[day].push(E("td", da("fc-dayVal"), ds.format(df)));
88 + days[day].push(E("td", da("fc-mainVal"), oc));
89 + if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
93 93   } else
94 94   days[day].push(E("td", {colspan}));
95 95   }
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,17 +1,18 @@
1 -#calendarCustom {
1 +#calendarCustom.fc {
2 2   td.fc-sat, td.fc-sun {
3 3   background-color: #f5f5f5;
4 4   }
5 - .fc-month-cols-view {
5 + .fc-month-cols-view > table {
6 + table-layout: auto;
7 + td, th {
8 + border-width: 0px;
9 + }
6 6   col.fc-fitCol {
7 - width: 20px;
8 - &.fc-dayVal {
9 - border-right: 0px;
10 - }
11 - &.fc-weekVal {
12 - border-left: 0px;
13 - }
11 + width: 1px;
14 14   }
13 + col.fc-borderLeft {
14 + border-left-width: 1px;
15 + }
15 15   .fc-body {
16 16   td {
17 17   position: relative;