Changes for page Home

Summary

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

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,7 +35,6 @@
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(_ => []);
...	...	@@ -53,7 +53,7 @@
53	53	const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
54	54
55	55	if (df) cols.push(E("col", {class: "fc-fitCol fc-fade fc-borderLeft"}));
56		- cols.push(E("col"), {class: df ? null : "fc-borderLeft"});
	55	+ cols.push(E("col", {class: df ? null : "fc-borderLeft"}));
57	57	if (wf) cols.push(E("col", {class: "fc-fitCol fc-fade"}));
58	58	head.push(E("th", {colspan}, ms.format(cf)));
59	59
...	...	@@ -73,23 +73,24 @@
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;
	80	+ if (v.start.isBefore(ms)) e.classList.add("fc-cut-start");
	81	+ if (me.isBefore(v.end)) e.classList.add("fc-cut-end");
80	80	oc.push(e);
81	81	// TODO: soft-columns
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		- }
	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)));
93	93	} else
94	94	days[day].push(E("td", {colspan}));
95	95	}

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -1,6 +1,9 @@
1	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	5	.fc-month-cols-view > table {
6	6	table-layout: auto;
...	...	@@ -14,11 +14,31 @@
14	14	border-left-width: 1px;
15	15	}
16	16	.fc-body {
17		- 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 {
18	18	position: relative;
19	19	& > div {
	29	+ z-index: 5;
20	20	position: absolute;
21	21	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	+ }
22	22	}
23	23	}
24	24	td.fc-weekVal {