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,10 +35,12 @@
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
	32	+ const cols = [];
38	38	const head = [];
39	39	const days = Array(31).fill().map(_ => []);
40	40
41	41	if (rf) {
	37	+ cols.push(E("col", {class: "fc-fitCol"}));
42	42	head.push(E("th"));
43	43	days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
44	44	}
...	...	@@ -49,6 +49,9 @@
49	49	const md = me.diff(ms, "days");
50	50	const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
51	51
	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"}));
52	52	head.push(E("th", {colspan}, ms.format(cf)));
53	53
54	54	const bgc = new Array(md);
...	...	@@ -67,20 +67,24 @@
67	67	for (const i of range(d))
68	68	bgc[day + i] = v.color;
69	69	} else {
70		- 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));
71	71	e.style.height = `${100 * d}%`;
72	72	if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
73	73	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");
74	74	oc.push(e);
75	75	// TODO: soft-columns
76	76	}
77	77	}
78	78
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)));
	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)));
84	84	} else
85	85	days[day].push(E("td", {colspan}));
86	86	}
...	...	@@ -90,6 +90,7 @@
90	90	this.el.addClass("fc-month-cols-view").html(
91	91	E(
92	92	"table",
	96	+ E("colgroup", cols),
93	93	E("thead", {class: "fc-head"}, E("tr", head)),
94	94	E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
95	95	)
...	...	@@ -126,7 +126,7 @@
126	126	right: "month,monthCols",
127	127	},
128	128	timeFormat: "H:mm",
129		- defaultView: "month",
	133	+ defaultView: "monthCols",
130	130	firstDay: "1",
131	131	minTime: "8:00",
132	132	maxTime: "23:00",

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -1,5 +1,69 @@
1		-#calendarCustom {
	1	+@weekend-color: #f5f5f5;
	2	+#calendarCustom.fc {
2	2	td.fc-sat, td.fc-sun {
3		- background-color: #f5f5f5;
	4	+ background-color: @weekend-color;
4	4	}
	6	+ .fc-month-cols-view > table {
	7	+ table-layout: auto;
	8	+ td, th {
	9	+ border-width: 0px;
	10	+ }
	11	+ col.fc-fitCol {
	12	+ width: 1px;
	13	+ }
	14	+ tbody.fc-body {
	15	+ td {
	16	+ background-color: #fff;
	17	+ &.fc-sat, &.fc-sun {
	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 {
	30	+ filter: brightness(0.95);
	31	+ }
	32	+ td.fc-mainVal {
	33	+ position: relative;
	34	+ & > div {
	35	+ z-index: 5;
	36	+ position: absolute;
	37	+ 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;
	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	+ }
	59	+ }
	60	+ }
	61	+ td.fc-dayVal, td.fc-weekVal {
	62	+ color: desaturate(lighten(#1D3B58, 50%), 80%);
	63	+ }
	64	+ td.fc-weekVal {
	65	+ text-align: right;
	66	+ }
	67	+ }
	68	+ }
5	5	}