Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.59
edited by Benjamin Fischer
on 2024/11/07 12:28
Change comment: There is no comment for this version
To version 72.78
edited by Benjamin Fischer
on 2024/11/07 13:50
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 - render() {
12 + Qrender() {
13 13   console.debug("render");
14 14   },
15 - renderSkeleton() {
15 + QrenderSkeleton() {
16 16   console.debug("renderSkeleton");
17 17   },
18 18   renderEvents(events) {
... ... @@ -35,10 +35,12 @@
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 + const cols = [];
38 38   const head = [];
39 39   const days = Array(31).fill().map(_ => []);
40 40  
41 41   if (rf) {
43 + cols.push(E("col", {class: "fc-fitCol"}));
42 42   head.push(E("th"));
43 43   days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
44 44   }
... ... @@ -49,6 +49,9 @@
49 49   const md = me.diff(ms, "days");
50 50   const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
51 51  
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"}));
52 52   head.push(E("th", {colspan}, ms.format(cf)));
53 53  
54 54   const bgc = new Array(md);
... ... @@ -67,7 +67,8 @@
67 67   for (const i of range(d))
68 68   bgc[day + i] = v.color;
69 69   } else {
70 - const e = E("div", v.title);
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);
71 71   e.style.height = `${100 * d}%`;
72 72   if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
73 73   if (v.textColor) e.style.color = v.textColor;
... ... @@ -76,11 +76,12 @@
76 76   }
77 77   }
78 78  
79 - const da = {class: this.getDayClasses(ds).join(" ")};
80 - if (df) days[day].push(E("td", da, ds.format(df)));
81 - if (bgc[day]) da.style = `background-color: ${bgc[day]};`;
82 - days[day].push(E("td", da, oc));
83 - if (wf) days[day].push(E("td", da, ds.weekday() ? "" : ds.format(wf)));
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)));
84 84   } else
85 85   days[day].push(E("td", {colspan}));
86 86   }
... ... @@ -90,6 +90,7 @@
90 90   this.el.addClass("fc-month-cols-view").html(
91 91   E(
92 92   "table",
100 + E("colgroup", cols),
93 93   E("thead", {class: "fc-head"}, E("tr", head)),
94 94   E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
95 95   )
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,5 +1,44 @@
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 > table {
6 + table-layout: auto;
7 + td, th {
8 + border-width: 0px;
9 + }
10 + col.fc-fitCol {
11 + width: 1px;
12 + }
13 + col.fc-borderLeft {
14 + border-left-width: 1px;
15 + }
16 + .fc-body {
17 + td {
18 + position: relative;
19 + & > div {
20 + z-index: 5;
21 + position: absolute;
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 + }
35 + }
36 + td.fc-weekVal {
37 + text-align: right;
38 + }
39 + .fc-fade {
40 + opacity: 0.3;
41 + }
42 + }
43 + }
5 5  }