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		- Qrender() {
	12	+ render() {
13	13	console.debug("render");
14	14	},
15		- QrenderSkeleton() {
	15	+ renderSkeleton() {
16	16	console.debug("renderSkeleton");
17	17	},
18	18	renderEvents(events) {
...	...	@@ -35,12 +35,10 @@
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 = [];
39	39	const head = [];
40	40	const days = Array(31).fill().map(_ => []);
41	41
42	42	if (rf) {
43		- cols.push(E("col", {class: "fc-fitCol"}));
44	44	head.push(E("th"));
45	45	days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
46	46	}
...	...	@@ -51,9 +51,6 @@
51	51	const md = me.diff(ms, "days");
52	52	const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
53	53
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"}));
57	57	head.push(E("th", {colspan}, ms.format(cf)));
58	58
59	59	const bgc = new Array(md);
...	...	@@ -67,13 +67,12 @@
67	67	while(mv[0]?.start.isBefore(de)) {
68	68	const v = mv.shift();
69	69	const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
70		- if (v.rendering == "background") {
	65	+ if (v.rendering == "background")
71	71	if (v.color)
72	72	for (const i of range(d))
73	73	bgc[day + i] = v.color;
74		- } else {
75		- const u = v.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1];
76		- const e = E("div", u ? E("a", {href: u}, v.title) : v.title);
	69	+ else {
	70	+ const e = E("div", 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,12 +82,11 @@
82	82	}
83	83	}
84	84
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)));
	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)));
91	91	} else
92	92	days[day].push(E("td", {colspan}));
93	93	}
...	...	@@ -97,7 +97,6 @@
97	97	this.el.addClass("fc-month-cols-view").html(
98	98	E(
99	99	"table",
100		- E("colgroup", cols),
101	101	E("thead", {class: "fc-head"}, E("tr", head)),
102	102	E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
103	103	)
...	...	@@ -117,7 +117,6 @@
117	117	},
118	118	monthCols: {
119	119	columnFormat: "MMM",
120		- weekFormat: "W",
121	121	titleFormat: "YYYY",
122	122	buttonText: "year",
123	123	},

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -1,32 +1,5 @@
1		-#calendarCustom.fc {
	1	+#calendarCustom {
2	2	td.fc-sat, td.fc-sun {
3	3	background-color: #f5f5f5;
4	4	}
5		- .fc-month-cols-view > table {
6		- table-layout: auto;
7		- td, th {
8		- border-width: 0px;
9		- }
10		- col.fc-fitCol {
11		- width: 1px;
12		- }
13		- col.fc-borderLeft {
14		- border-left-width: 1px;
15		- }
16		- .fc-body {
17		- td {
18		- position: relative;
19		- & > div {
20		- position: absolute;
21		- width: 100%;
22		- }
23		- }
24		- td.fc-weekVal {
25		- text-align: right;
26		- }
27		- .fc-fade {
28		- opacity: 0.3;
29		- }
30		- }
31		- }
32	32	}