Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.69
edited by Benjamin Fischer
on 2024/11/07 13:13
Change comment: There is no comment for this version
To version 72.83
edited by Benjamin Fischer
on 2024/11/07 15:17
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,13 +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 -
39 39   const cols = [];
40 40   const head = [];
41 41   const days = Array(31).fill().map(_ => []);
42 42  
43 43   if (rf) {
44 - cols.push(E("col", {width: "0*", class1: "fc-fitCol"}));
43 + cols.push(E("col", {class: "fc-fitCol"}));
45 45   head.push(E("th"));
46 46   days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
47 47   }
... ... @@ -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", {width: "0*", class1: "fc-fitCol fc-fade fc-dayVal"}));
56 - cols.push(E("col"));
57 - if (wf) cols.push(E("col", {width: "0*", class1: "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);
... ... @@ -73,7 +73,8 @@
73 73   for (const i of range(d))
74 74   bgc[day + i] = v.color;
75 75   } else {
76 - const e = E("div", v.title);
75 + const href = v.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1] ?? v.url;
76 + const e = E("div", E("a", {href}, 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,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 - }
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)));
93 93   } else
94 94   days[day].push(E("td", {colspan}));
95 95   }
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,23 +1,47 @@
1 -#calendarCustom {
1 +#calendarCustom.fc {
2 2   td.fc-sat, td.fc-sun {
3 3   background-color: #f5f5f5;
4 + &.fc-dayVal {
5 + background-color: #f5f5f5 !important;
6 + }
4 4   }
5 - .fc-month-cols-view {
8 + .fc-month-cols-view > table {
9 + table-layout: auto;
10 + td, th {
11 + border-width: 0px;
12 + }
6 6   col.fc-fitCol {
7 - width: 20px;
8 - &.fc-dayVal {
9 - border-right: 0px;
10 - }
11 - &.fc-weekVal {
12 - border-left: 0px;
13 - }
14 + width: 1px;
14 14   }
16 + col.fc-borderLeft {
17 + border-left-width: 1px;
18 + }
15 15   .fc-body {
16 - td {
20 + tr:nth-child(4n+3) > * {
21 + border-top: 1px solid #ddd;
22 + }
23 + tr:nth-child(4n+5) > * {
24 + border-top: 1px solid #bbb;
25 + }
26 + td.fc-mainVal {
17 17   position: relative;
18 18   & > div {
29 + z-index: 5;
19 19   position: absolute;
20 20   width: 100%;
32 + overflow: hidden;
33 + border-radius: 4px;
34 + &:hover {
35 + width: auto;
36 + max-width: 10vw;
37 + height: auto !important;
38 + z-index: 10;
39 + }
40 + & > a {
41 + display: block;
42 + color: inherit;
43 + background-color: inherit;
44 + }
21 21   }
22 22   }
23 23   td.fc-weekVal {