Changes for page Home

Summary

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

Details

Page properties

Content

...	...	@@ -1,6 +1,6 @@
1	1	{{box cssClass="floatinginfobox" image="https://wiki.test.erumdatahub.de/bin/download/Main/WebHome/logo_horizontal_23_neu.png?width=200"}}
2	2	{{displayIcon name="application_view_tile"/}} [[Indico>>https://indico.desy.de/category/984/]]
3		-{{displayIcon name="email"/}} [[Mailing Lists]]
	3	+{{displayIcon name="email"/}} [[Mailing Lists>>https://wiki.erumdatahub.de/de/mailing-lists]]
4	4	{{displayIcon name="world"/}} [[Website>>https://erumdatahub.de/]]
5	5	{{/box}}
6	6

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -9,12 +9,6 @@
9	9	const range = num => Array(num).fill().map((_, i) => i);
10	10	FC.defineView('monthCols', {
11	11	class: FC.View.extend({
12		- render() {
13		- console.debug("render");
14		- },
15		- renderSkeleton() {
16		- console.debug("renderSkeleton");
17		- },
18	18	renderEvents(events) {
19	19	console.debug("renderEvents", events);
20	20	debugger;
...	...	@@ -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(_ => []);
...	...	@@ -52,12 +52,20 @@
52	52	const md = me.diff(ms, "days");
53	53	const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
54	54
55		- if (df) cols.push(E("col", {class: "fc-fitCol fc-fade fc-borderLeft"}));
56		- cols.push(E("col", {class: df ? null : "fc-borderLeft"}));
57		- 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"}));
58	58	head.push(E("th", {colspan}, ms.format(cf)));
59	59
60	60	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	+ };
61	61
62	62	for (const day of range(31)) {
63	63	if (day < md) {
...	...	@@ -70,24 +70,41 @@
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 e = E("div", v.title);
	79	+ const href = v.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1] ?? v.url;
	80	+ 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;
	84	+ if (v.start.isBefore(ms)) e.classList.add("fc-cut-start");
	85	+ if (me.isBefore(v.end)) e.classList.add("fc-cut-end");
80	80	oc.push(e);
81		- // TODO: soft-columns
	87	+ const i = scu.indexOf(0);
	88	+ if (i < 0) {
	89	+ scc.push([e]);
	90	+ scu.push(d);
	91	+ scc.forEach((els, col) => els.forEach(scs(col)));
	92	+ } else {
	93	+ scc[i].push(e);
	94	+ scu[i] = d;
	95	+ scs(i)(e);
	96	+ }
82	82	}
83	83	}
84	84
	100	+ scu = scu.map(u => Math.max(0, u - 1));
	101	+ if (!scu.some()) {scc = []; scu = [];}
	102	+
85	85	const style = bgc[day] && `background-color: ${bgc[day]};`;
86	86	const dc = this.getDayClasses(ds);
87		- const ds = sub => ({class: dc.concat(sub).join(" "), style});
88		- if (df) days[day].push(E("td", ds("fc-dayVal"), ds.format(df)));
89		- days[day].push(E("td", ds("fc-mainVal"), oc));
90		- if (wf) days[day].push(E("td", ds("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
	105	+ const da = (sub, title = bgt[day] ?? null) => ({class: dc.concat(sub).join(" "), style, title});
	106	+ if (df) days[day].push(E("td", da("fc-dayVal", ds.format("D")), ds.format(df)));
	107	+ days[day].push(E("td", da("fc-mainVal"), oc));
	108	+ if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
91	91	} else
92	92	days[day].push(E("td", {colspan}));
93	93	}
...	...	@@ -134,11 +134,10 @@
134	134	right: "month,monthCols",
135	135	},
136	136	timeFormat: "H:mm",
137		- defaultView: "month",
	155	+ defaultView: "monthCols",
138	138	firstDay: "1",
139	139	minTime: "8:00",
140	140	maxTime: "23:00",
141		- defaultDate: "2024-11-06",
142	142	editable: false,
143	143	eventDataTransform: event => {
144	144	if (event.url.split("/")[4] === "Holidays") event.rendering = "background";

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -1,6 +1,7 @@
	1	+@weekend-color: #f5f5f5;
1	1	#calendarCustom.fc {
2	2	td.fc-sat, td.fc-sun {
3		- background-color: #f5f5f5;
	4	+ background-color: @weekend-color;
4	4	}
5	5	.fc-month-cols-view > table {
6	6	table-layout: auto;
...	...	@@ -10,23 +10,63 @@
10	10	col.fc-fitCol {
11	11	width: 1px;
12	12	}
13		- col.fc-borderLeft {
14		- border-left-width: 1px;
15		- }
16		- .fc-body {
	14	+ tbody.fc-body {
17	17	td {
	16	+ &.fc-sat, &.fc-sun {
	17	+ background-color: @weekend-color;
	18	+ &.fc-dayVal {
	19	+ background-color: @weekend-color !important;
	20	+ }
	21	+ }
	22	+ }
	23	+ tr:nth-child(4n+3) > * {
	24	+ border-top: 1px solid #ddd;
	25	+ }
	26	+ tr:nth-child(4n+5) > * {
	27	+ border-top: 1px solid #bbb;
	28	+ }
	29	+ tr:hover > th {
	30	+ background-color: #ccc;
	31	+ }
	32	+ td.fc-mainVal {
18	18	position: relative;
19	19	& > div {
	35	+ z-index: 5;
20	20	position: absolute;
21	21	width: 100%;
	38	+ overflow: hidden;
	39	+ border-radius: 4px;
	40	+ &.fc-cut-start {
	41	+ border-top-left-radius: 0px;
	42	+ border-top-right-radius: 0px;
	43	+ }
	44	+ &.fc-cut-end {
	45	+ border-bottom-left-radius: 0px;
	46	+ border-bottom-right-radius: 0px;
	47	+ }
	48	+ &:hover {
	49	+ width: auto !important;
	50	+ max-width: 10vw;
	51	+ height: auto !important;
	52	+ z-index: 10;
	53	+ }
	54	+ & > a {
	55	+ display: block;
	56	+ color: inherit;
	57	+ background-color: inherit;
	58	+ }
22	22	}
23	23	}
	61	+ td.fc-dayVal, td.fc-weekVal {
	62	+ color: desaturate(lighten(#1D3B58, 50%), 80%);
	63	+ }
	64	+ td.fc-dayVal {
	65	+ font-size: small;
	66	+ }
24	24	td.fc-weekVal {
	68	+ font-size: smaller;
25	25	text-align: right;
26	26	}
27		- .fc-fade {
28		- opacity: 0.3;
29		- }
30		- }
31		- }
	71	+ }
	72	+ }
32	32	}