Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.90
edited by Benjamin Fischer
on 2024/11/07 15:32
Change comment: There is no comment for this version
To version 80.1
edited by Judith Steinfeld
on 2024/11/12 08:30
Change comment: There is no comment for this version

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.fischer
1 +XWiki.JudithSteinfeld
Content
... ... @@ -1,14 +1,19 @@
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>>doc:DIG-UM.Mailing Lists.WebHome]]
4 4  {{displayIcon name="world"/}} [[Website>>https://erumdatahub.de/]]
5 +
6 +//{{icon name="info-circle"/}}//ErUM =** Er**forschung von** U**niversum & **M**aterie
7 +(Research on Universe and Matter)
5 5  {{/box}}
6 6  
7 -Welcome to the new ErUM-Data-Hub Wiki - a place for all ErUM-Data communities, to interact and share information with one another.
10 +==== **Welcome to the new ErUM-Data-Hub Wiki - a place for all ErUM-Data communities, to interact and share information with one another.** ====
8 8  
9 9  If you have any ideas for new features or content that you would want to find here, feel free to get in contact with us.
10 10  Otherwise, you can always create an account and contribute improvements or novel content yourself. For now, the registration is not open to the puplic.
11 11  
15 += =
16 +
12 12  = What is new? =
13 13  
14 14  Have a look at our new comprehensive:
... ... @@ -16,6 +16,8 @@
16 16  * [[Material collection]] of learning and teaching materials, and
17 17  * [[People in ErUM-Data]] list of research groups and contact information of people who work in ErUM-Data.
18 18  
24 += =
25 +
19 19  = ErUM-Data Calendar =
20 20  
21 21  {{velocity output="false"}}
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;
... ... @@ -51,12 +51,20 @@
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"}));
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"}));
57 57   head.push(E("th", {colspan}, ms.format(cf)));
58 58  
59 59   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 + };
60 60  
61 61   for (const day of range(31)) {
62 62   if (day < md) {
... ... @@ -69,11 +69,12 @@
69 69   const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
70 70   if (v.rendering == "background") {
71 71   if (v.color)
72 - for (const i of range(d))
74 + for (const i of range(d)) {
73 73   bgc[day + i] = v.color;
76 + bgt[day + i] = v.title;
77 + }
74 74   } else {
75 - const href = v.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1] ?? v.url;
76 - const e = E("div", E("a", {href}, v.title));
79 + const e = E("div", E("a", {href: v.url}, 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;
... ... @@ -80,14 +80,26 @@
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
86 + const i = scu.indexOf(0);
87 + if (i < 0) {
88 + scc.push([e]);
89 + scu.push(d);
90 + scc.forEach((els, col) => els.forEach(scs(col)));
91 + } else {
92 + scc[i].push(e);
93 + scu[i] = d;
94 + scs(i)(e);
95 + }
84 84   }
85 85   }
86 86  
99 + scu = scu.map(u => Math.max(0, u - 1));
100 + if (!scu.some()) {scc = []; scu = [];}
101 +
87 87   const style = bgc[day] && `background-color: ${bgc[day]};`;
88 88   const dc = this.getDayClasses(ds);
89 - const da = sub => ({class: dc.concat(sub).join(" "), style});
90 - if (df) days[day].push(E("td", da("fc-dayVal"), ds.format(df)));
104 + const da = (sub, title = bgt[day] ?? null) => ({class: dc.concat(sub).join(" "), style, title});
105 + if (df) days[day].push(E("td", da("fc-dayVal", ds.format("D")), ds.format(df)));
91 91   days[day].push(E("td", da("fc-mainVal"), oc));
92 92   if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
93 93   } else
... ... @@ -136,14 +136,16 @@
136 136   right: "month,monthCols",
137 137   },
138 138   timeFormat: "H:mm",
139 - defaultView: "month",
154 + defaultView: "monthCols",
140 140   firstDay: "1",
141 141   minTime: "8:00",
142 142   maxTime: "23:00",
143 - defaultDate: "2024-11-06",
144 144   editable: false,
145 145   eventDataTransform: event => {
146 - if (event.url.split("/")[4] === "Holidays") event.rendering = "background";
160 + const cal = event.url.split("/")[4];
161 + if (cal === "Holidays" || cal == "Blocked" || cal.includes("Conference")) event.rendering = "background";
162 + event.viewUrl = event.url;
163 + event.url = event.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1] ?? event.url;
147 147   return event;
148 148   },
149 149   eventRender: function (event, element) {
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,15 @@
13 13   col.fc-fitCol {
14 14   width: 1px;
15 15   }
16 - .fc-body {
14 + tbody.fc-body {
15 + td {
16 + &.fc-sat, &.fc-sun {
17 + background-color: @weekend-color;
18 + &.fc-dayVal {
19 + background-color: @weekend-color !important;
20 + }
21 + }
22 + }
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 - tr:hover {
24 - filter: brightness(0.95);
29 + tr:hover > th {
30 + background-color: #ccc;
25 25   }
26 26   td.fc-mainVal {
27 27   position: relative;
... ... @@ -40,7 +40,7 @@
40 40   border-bottom-right-radius: 0px;
41 41   }
42 42   &:hover {
43 - width: auto;
49 + width: auto !important;
44 44   max-width: 10vw;
45 45   height: auto !important;
46 46   z-index: 10;
... ... @@ -52,12 +52,17 @@
52 52   }
53 53   }
54 54   }
61 + td.fc-dayVal, td.fc-weekVal {
62 + color: #7f95aa;
63 + cursor: default;
64 + }
65 + td.fc-dayVal {
66 + font-size: small;
67 + }
55 55   td.fc-weekVal {
69 + font-size: smaller;
56 56   text-align: right;
57 57   }
58 - .fc-fade2 {
59 - opacity: 0.3;
60 - }
61 61   }
62 62   }
63 63  }