Changes for page Home

Summary

• Objects (2 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]
  • XWiki.StyleSheetExtension[0]

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -45,20 +45,12 @@
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"}));
49		- cols.push(E("col"));
50		- if (wf) cols.push(E("col", {class: "fc-fitCol"}));
	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"}));
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);
55		- let scc = [];
56		- let scu = [];
57		- const scs = col => el => {
58		- const step = 100 / scc.length;
59		- el.style.left = `${col * step}%`;
60		- el.style.width = `${step}%`;
61		- };
62	62
63	63	for (const day of range(31)) {
64	64	if (day < md) {
...	...	@@ -71,12 +71,11 @@
71	71	const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
72	72	if (v.rendering == "background") {
73	73	if (v.color)
74		- for (const i of range(d)) {
	66	+ for (const i of range(d))
75	75	bgc[day + i] = v.color;
76		- bgt[day + i] = v.title;
77		- }
78	78	} else {
79		- const e = E("div", E("a", {href: v.url}, v.title));
	69	+ const href = v.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1] ?? v.url;
	70	+ const e = E("div", E("a", {href}, v.title));
80	80	e.style.height = `${100 * d}%`;
81	81	if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
82	82	if (v.textColor) e.style.color = v.textColor;
...	...	@@ -83,26 +83,14 @@
83	83	if (v.start.isBefore(ms)) e.classList.add("fc-cut-start");
84	84	if (me.isBefore(v.end)) e.classList.add("fc-cut-end");
85	85	oc.push(e);
86		- const i = scu.indexOf(0);
87		- if (i < 0) {
88		- scc.push([e]);
89		- scu.push(d);
90		- scc.forEach((els, col) => els.forEach(scs(col)));
91		- } else {
92		- scc[i].push(e);
93		- scu[i] = d;
94		- scs(i)(e);
95		- }
	77	+ // TODO: soft-columns
96	96	}
97	97	}
98	98
99		- scu = scu.map(u => Math.max(0, u - 1));
100		- if (!scu.some()) {scc = []; scu = [];}
101		-
102	102	const style = bgc[day] && `background-color: ${bgc[day]};`;
103	103	const dc = this.getDayClasses(ds);
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)));
	83	+ const da = sub => ({class: dc.concat(sub).join(" "), style});
	84	+ if (df) days[day].push(E("td", da("fc-dayVal"), ds.format(df)));
106	106	days[day].push(E("td", da("fc-mainVal"), oc));
107	107	if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
108	108	} else
...	...	@@ -155,12 +155,10 @@
155	155	firstDay: "1",
156	156	minTime: "8:00",
157	157	maxTime: "23:00",
	137	+ defaultDate: "2024-11-06",
158	158	editable: false,
159	159	eventDataTransform: event => {
160		- const cal = event.url.split("/")[4];
161		- if (cal === "Holidays" || 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;
	140	+ if (event.url.split("/")[4] === "Holidays") event.rendering = "background";
164	164	return event;
165	165	},
166	166	eventRender: function (event, element) {

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -13,6 +13,7 @@
13	13	}
14	14	tbody.fc-body {
15	15	td {
	16	+ background-color: #fff;
16	16	&.fc-sat, &.fc-sun {
17	17	background-color: @weekend-color;
18	18	&.fc-dayVal {
...	...	@@ -27,7 +27,7 @@
27	27	border-top: 1px solid #bbb;
28	28	}
29	29	tr:hover > th {
30		- background-color: #ccc;
	31	+ filter: brightness(0.8);
31	31	}
32	32	td.fc-mainVal {
33	33	position: relative;
...	...	@@ -46,7 +46,7 @@
46	46	border-bottom-right-radius: 0px;
47	47	}
48	48	&:hover {
49		- width: auto !important;
	50	+ width: auto;
50	50	max-width: 10vw;
51	51	height: auto !important;
52	52	z-index: 10;
...	...	@@ -59,14 +59,9 @@
59	59	}
60	60	}
61	61	td.fc-dayVal, td.fc-weekVal {
62		- color: #7f95aa;
63		- cursor: default;
	63	+ color: desaturate(lighten(#1D3B58, 50%), 80%);
64	64	}
65		- td.fc-dayVal {
66		- font-size: small;
67		- }
68	68	td.fc-weekVal {
69		- font-size: smaller;
70	70	text-align: right;
71	71	}
72	72	}