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		- Qrender() {
13		- console.debug("render");
14		- },
15		- QrenderSkeleton() {
16		- console.debug("renderSkeleton");
17		- },
18	18	renderEvents(events) {
19	19	console.debug("renderEvents", events);
20	20	debugger;
...	...	@@ -57,6 +57,13 @@
57	57	head.push(E("th", {colspan}, ms.format(cf)));
58	58
59	59	const bgc = new Array(md);
	54	+ let scc = [];
	55	+ let scu = [];
	56	+ const scs = col => el => {
	57	+ const step = 100 / scc.length;
	58	+ el.style.left = `${col * step}%`;
	59	+ el.style.width = `${step}%`;
	60	+ };
60	60
61	61	for (const day of range(31)) {
62	62	if (day < md) {
...	...	@@ -80,10 +80,22 @@
80	80	if (v.start.isBefore(ms)) e.classList.add("fc-cut-start");
81	81	if (me.isBefore(v.end)) e.classList.add("fc-cut-end");
82	82	oc.push(e);
83		- // TODO: soft-columns
	84	+ const i = scu.indexOf(0);
	85	+ if (i < 0) {
	86	+ scc.push([e]);
	87	+ scu.push(d);
	88	+ scc.forEach((els, col) => els.forEach(scs(col)));
	89	+ } else {
	90	+ scc[i].push(e);
	91	+ scu[i] = d;
	92	+ scs(i)(e);
	93	+ }
84	84	}
85	85	}
86	86
	97	+ scu = scu.map(u => Math.max(0, u - 1));
	98	+ if (!scu.some()) {scc = []; scu = [];}
	99	+
87	87	const style = bgc[day] && `background-color: ${bgc[day]};`;
88	88	const dc = this.getDayClasses(ds);
89	89	const da = sub => ({class: dc.concat(sub).join(" "), style});
...	...	@@ -136,7 +136,7 @@
136	136	right: "month,monthCols",
137	137	},
138	138	timeFormat: "H:mm",
139		- defaultView: "month",
	152	+ defaultView: "monthCols",
140	140	firstDay: "1",
141	141	minTime: "8:00",
142	142	maxTime: "23:00",

XWiki.StyleSheetExtension[0]

Code

...	...	@@ -1,9 +1,7 @@
	1	+@weekend-color: #f5f5f5;
1	1	#calendarCustom.fc {
2	2	td.fc-sat, td.fc-sun {
3		- background-color: #f5f5f5;
4		- &.fc-dayVal {
5		- background-color: #f5f5f5 !important;
6		- }
	4	+ background-color: @weekend-color;
7	7	}
8	8	.fc-month-cols-view > table {
9	9	table-layout: auto;
...	...	@@ -13,7 +13,16 @@
13	13	col.fc-fitCol {
14	14	width: 1px;
15	15	}
16		- .fc-body {
	14	+ tbody.fc-body {
	15	+ td {
	16	+ background-color: #fff;
	17	+ &.fc-sat, &.fc-sun {
	18	+ background-color: @weekend-color;
	19	+ &.fc-dayVal {
	20	+ background-color: @weekend-color !important;
	21	+ }
	22	+ }
	23	+ }
17	17	tr:nth-child(4n+3) > * {
18	18	border-top: 1px solid #ddd;
19	19	}
...	...	@@ -20,8 +20,8 @@
20	20	tr:nth-child(4n+5) > * {
21	21	border-top: 1px solid #bbb;
22	22	}
23		- trq:hover {
24		- filter: brightness(0.95);
	30	+ tr:hover > th {
	31	+ filter: brightness(0.8);
25	25	}
26	26	td.fc-mainVal {
27	27	position: relative;
...	...	@@ -52,12 +52,12 @@
52	52	}
53	53	}
54	54	}
	62	+ td.fc-dayVal, td.fc-weekVal {
	63	+ color: desaturate(lighten(#1D3B58, 50%), 80%);
	64	+ }
55	55	td.fc-weekVal {
56	56	text-align: right;
57	57	}
58		- .fc-fade2 {
59		- opacity: 0.3;
60		- }
61	61	}
62	62	}
63	63	}