Changes for page Home

Summary

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

Details

Page properties

Author

...	...	@@ -1,1 +1,1 @@
1		-XWiki.fischer
	1	+XWiki.JudithSteinfeld

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(_ => []);
...	...	@@ -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);
	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));
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;
	74	+ if (v.start.isBefore(ms)) e.classList.add("fc-cut-start");
	75	+ 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		- }
	81	+ const style = bgc[day] && `background-color: ${bgc[day]};`;
	82	+ const dc = this.getDayClasses(ds);
	83	+ const da = sub => ({class: dc.concat(sub).join(" "), style});
	84	+ if (df) days[day].push(E("td", da("fc-dayVal"), ds.format(df)));
	85	+ days[day].push(E("td", da("fc-mainVal"), oc));
	86	+ 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	}
...	...	@@ -136,7 +136,7 @@
136	136	right: "month,monthCols",
137	137	},
138	138	timeFormat: "H:mm",
139		- defaultView: "month",
	133	+ defaultView: "monthCols",
140	140	firstDay: "1",
141	141	minTime: "8:00",
142	142	maxTime: "23:00",

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;
...	...	@@ -10,23 +10,51 @@
10	10	col.fc-fitCol {
11	11	width: 1px;
12	12	}
13		- col.fc-borderLeft {
14		- border-left-width: 1px;
15		- }
16	16	.fc-body {
17		- td {
	17	+ tr:nth-child(4n+3) > * {
	18	+ border-top: 1px solid #ddd;
	19	+ }
	20	+ tr:nth-child(4n+5) > * {
	21	+ border-top: 1px solid #bbb;
	22	+ }
	23	+ tr:hover {
	24	+ filter: brightness(0.95);
	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	+ &.fc-cut-start {
	35	+ border-top-left-radius: 0px;
	36	+ border-top-right-radius: 0px;
	37	+ }
	38	+ &.fc-cut-end {
	39	+ border-bottom-left-radius: 0px;
	40	+ border-bottom-right-radius: 0px;
	41	+ }
	42	+ &:hover {
	43	+ width: auto;
	44	+ max-width: 10vw;
	45	+ height: auto !important;
	46	+ z-index: 10;
	47	+ }
	48	+ & > a {
	49	+ display: block;
	50	+ color: inherit;
	51	+ background-color: inherit;
	52	+ }
22	22	}
23	23	}
24	24	td.fc-weekVal {
25	25	text-align: right;
26	26	}
27		- .fc-fade {
	58	+ .fc-fade2 {
28	28	opacity: 0.3;
29	29	}
30		- }
31		- }
	61	+ }
	62	+ }
32	32	}