Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.57
edited by Benjamin Fischer
on 2024/11/07 12:18
Change comment: There is no comment for this version
To version 72.85
edited by Benjamin Fischer
on 2024/11/07 15:24
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   }
... ... @@ -47,8 +47,11 @@
47 47   const ms = ys.clone().add({month})
48 48   const me = ms.clone().add({month: 1});
49 49   const md = me.diff(ms, "days");
50 - const mv = yv.filter(t => ms.isBefore(t.end) || t.start.isBefore(me));
52 + 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);
... ... @@ -62,25 +62,29 @@
62 62   while(mv[0]?.start.isBefore(de)) {
63 63   const v = mv.shift();
64 64   const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
65 - if (v.rendering == "background")
70 + if (v.rendering == "background") {
66 66   if (v.color)
67 67   for (const i of range(d))
68 68   bgc[day + i] = v.color;
69 - else {
70 - const e = E("div", v.title);
74 + } else {
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));
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;
80 + if (v.start.isBefore(ms)) e.classList.add("fc-cut-start");
81 + if (me.isBefore(v.end)) e.classList.add("fc-cut-end");
74 74   oc.push(e);
75 75   // TODO: soft-columns
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)));
87 + const style = bgc[day] && `background-color: ${bgc[day]};`;
88 + const dc = this.getDayClasses(ds);
89 + const da = sub => ({class: dc.concat(sub).join(" "), style});
90 + if (df) days[day].push(E("td", da("fc-dayVal"), ds.format(df)));
91 + days[day].push(E("td", da("fc-mainVal"), oc));
92 + 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",
102 + 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   )
... ... @@ -109,6 +109,7 @@
109 109   },
110 110   monthCols: {
111 111   columnFormat: "MMM",
122 + weekFormat: "W",
112 112   titleFormat: "YYYY",
113 113   buttonText: "year",
114 114   },
XWiki.StyleSheetExtension[0]
Code
... ... @@ -1,5 +1,63 @@
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   }
8 + .fc-month-cols-view > table {
9 + table-layout: auto;
10 + td, th {
11 + border-width: 0px;
12 + }
13 + col.fc-fitCol {
14 + width: 1px;
15 + }
16 + col.fc-borderLeft {
17 + border-left-width: 1px;
18 + }
19 + .fc-body {
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 {
27 + position: relative;
28 + & > div {
29 + z-index: 5;
30 + position: absolute;
31 + width: 100%;
32 + overflow: hidden;
33 + border-radius: 4px;
34 + &.fc-cut-start {
35 + border-top-left-radius: 0px;
36 + border-top-right-radius: 0px;
37 + }
38 + &.fc-cut-end {
39 + border-bottom-left-radius: 0px;
40 + border-bottom-right-radius: 0px;
41 + }
42 + &:hover {
43 + width: auto;
44 + max-width: 10vw;
45 + height: auto !important;
46 + z-index: 10;
47 + }
48 + & > a {
49 + display: block;
50 + color: inherit;
51 + background-color: inherit;
52 + }
53 + }
54 + }
55 + td.fc-weekVal {
56 + text-align: right;
57 + }
58 + .fc-fade {
59 + opacity: 0.3;
60 + }
61 + }
62 + }
5 5  }