Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20

From version 73.16
edited by Benjamin Fischer
on 2024/11/08 10:41
Change comment: There is no comment for this version
To version 73.25
edited by Benjamin Fischer
on 2024/11/08 15:41
Change comment: There is no comment for this version

Summary

Details

XWiki.JavaScriptExtension[0]
Code
... ... @@ -45,12 +45,13 @@
45 45   const md = me.diff(ms, "days");
46 46   const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
47 47  
48 - if (df) cols.push(E("col", {class: "fc-fitCol fc-fade fc-borderLeft"}));
49 - cols.push(E("col", {class: df ? null : "fc-borderLeft"}));
50 - if (wf) cols.push(E("col", {class: "fc-fitCol fc-fade"}));
48 + if (df) cols.push(E("col", {class: "fc-fitCol"}));
49 + cols.push(E("col"));
50 + if (wf) cols.push(E("col", {class: "fc-fitCol"}));
51 51   head.push(E("th", {colspan}, ms.format(cf)));
52 52  
53 53   const bgc = new Array(md);
54 + const bgt = new Array(md);
54 54   let scc = [];
55 55   let scu = [];
56 56   const scs = col => el => {
... ... @@ -70,11 +70,12 @@
70 70   const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
71 71   if (v.rendering == "background") {
72 72   if (v.color)
73 - for (const i of range(d))
74 + for (const i of range(d)) {
74 74   bgc[day + i] = v.color;
76 + bgt[day + i] = v.title;
77 + }
75 75   } else {
76 - const href = v.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1] ?? v.url;
77 - const e = E("div", E("a", {href}, v.title));
79 + const e = E("div", E("a", {href: v.url}, v.title));
78 78   e.style.height = `${100 * d}%`;
79 79   if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
80 80   if (v.textColor) e.style.color = v.textColor;
... ... @@ -99,8 +99,8 @@
99 99  
100 100   const style = bgc[day] && `background-color: ${bgc[day]};`;
101 101   const dc = this.getDayClasses(ds);
102 - const da = sub => ({class: dc.concat(sub).join(" "), style});
103 - if (df) days[day].push(E("td", da("fc-dayVal"), ds.format(df)));
104 + const da = (sub, title = bgt[day] ?? null) => ({class: dc.concat(sub).join(" "), style, title});
105 + if (df) days[day].push(E("td", da("fc-dayVal", ds.format("D")), ds.format(df)));
104 104   days[day].push(E("td", da("fc-mainVal"), oc));
105 105   if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
106 106   } else
... ... @@ -153,10 +153,12 @@
153 153   firstDay: "1",
154 154   minTime: "8:00",
155 155   maxTime: "23:00",
156 - defaultDate: "2024-11-06",
157 157   editable: false,
158 158   eventDataTransform: event => {
159 - if (event.url.split("/")[4] === "Holidays") event.rendering = "background";
160 + const cal = event.url.split("/")[4];
161 + if (cal === "Holidays" || cal == "Blocked" || cal.includes("Conference")) event.rendering = "background";
162 + event.viewUrl = event.url;
163 + event.url = event.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1] ?? event.url;
160 160   return event;
161 161   },
162 162   eventRender: function (event, element) {
XWiki.StyleSheetExtension[0]
Code
... ... @@ -13,7 +13,6 @@
13 13   }
14 14   tbody.fc-body {
15 15   td {
16 - background-color: #fff;
17 17   &.fc-sat, &.fc-sun {
18 18   background-color: @weekend-color;
19 19   &.fc-dayVal {
... ... @@ -60,7 +60,8 @@
60 60   }
61 61   }
62 62   td.fc-dayVal, td.fc-weekVal {
63 - color: desaturate(lighten(#1D3B58, 50%), 80%);
62 + color: #7f95aa;
63 + cursor: default;
64 64   }
65 65   td.fc-dayVal {
66 66   font-size: small;