Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.78
edited by Benjamin Fischer
on 2024/11/07 13:50
Change comment: There is no comment for this version
To version 72.71
edited by Benjamin Fischer
on 2024/11/07 13:26
Change comment: There is no comment for this version

Summary

Details

XWiki.JavaScriptExtension[0]
Code
... ... @@ -9,10 +9,10 @@
9 9   const range = num => Array(num).fill().map((_, i) => i);
10 10   FC.defineView('monthCols', {
11 11   class: FC.View.extend({
12 - Qrender() {
12 + render() {
13 13   console.debug("render");
14 14   },
15 - QrenderSkeleton() {
15 + renderSkeleton() {
16 16   console.debug("renderSkeleton");
17 17   },
18 18   renderEvents(events) {
... ... @@ -35,6 +35,7 @@
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 +
38 38   const cols = [];
39 39   const head = [];
40 40   const days = Array(31).fill().map(_ => []);
... ... @@ -51,9 +51,9 @@
51 51   const md = me.diff(ms, "days");
52 52   const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
53 53  
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"}));
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"}));
57 57   head.push(E("th", {colspan}, ms.format(cf)));
58 58  
59 59   const bgc = new Array(md);
... ... @@ -72,8 +72,7 @@
72 72   for (const i of range(d))
73 73   bgc[day + i] = v.color;
74 74   } else {
75 - const u = v.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1];
76 - const e = E("div", u ? E("a", {href: u}, v.title) : v.title);
76 + const e = E("div", v.title);
77 77   e.style.height = `${100 * d}%`;
78 78   if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
79 79   if (v.textColor) e.style.color = v.textColor;
... ... @@ -82,12 +82,14 @@
82 82   }
83 83   }
84 84  
85 - const style = bgc[day] && `background-color: ${bgc[day]};`;
86 - const dc = this.getDayClasses(ds);
87 - const da = sub => ({class: dc.concat(sub).join(" "), style});
88 - if (df) days[day].push(E("td", da("fc-dayVal"), ds.format(df)));
89 - days[day].push(E("td", da("fc-mainVal"), oc));
90 - if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
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 + }
91 91   } else
92 92   days[day].push(E("td", {colspan}));
93 93   }
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,36 +1,24 @@
1 -#calendarCustom.fc {
1 +#calendarCustom {
2 2   td.fc-sat, td.fc-sun {
3 3   background-color: #f5f5f5;
4 4   }
5 5   .fc-month-cols-view > table {
6 6   table-layout: auto;
7 - td, th {
8 - border-width: 0px;
9 - }
10 10   col.fc-fitCol {
11 11   width: 1px;
9 + &.fc-dayVal {
10 + border-right: 0px;
11 + }
12 + &.fc-weekVal {
13 + border-left: 0px;
14 + }
12 12   }
13 - col.fc-borderLeft {
14 - border-left-width: 1px;
15 - }
16 16   .fc-body {
17 17   td {
18 18   position: relative;
19 19   & > div {
20 - z-index: 5;
21 21   position: absolute;
22 22   width: 100%;
23 - overflow: hidden;
24 - &:hover {
25 - width: auto;
26 - max-width: 10va;
27 - height: auto !important;
28 - }
29 - & > a {
30 - display: block;
31 - color: inherit;
32 - background-color: inherit;
33 - }
34 34   }
35 35   }
36 36   td.fc-weekVal {