Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.76
edited by Benjamin Fischer
on 2024/11/07 13:41
Change comment: There is no comment for this version
To version 95.1
edited by Angela Warkentin
on 2025/01/09 11:15
Change comment: There is no comment for this version

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.fischer
1 +XWiki.Angela_Warkentin
Content
... ... @@ -1,23 +1,39 @@
1 +=== ===
2 +
1 1  {{box cssClass="floatinginfobox" image="https://wiki.test.erumdatahub.de/bin/download/Main/WebHome/logo_horizontal_23_neu.png?width=200"}}
2 -{{displayIcon name="application_view_tile"/}} [[Indico>>https://indico.desy.de/category/984/]]
3 -{{displayIcon name="email"/}} [[Mailing Lists]]
4 +{{displayIcon name="application_view_tile"/}} [[Events (Indico)>>https://indico.desy.de/category/984/]]
5 +{{displayIcon name="email"/}} [[Mailing Lists>>doc:DIG-UM.Mailing Lists.WebHome]]
4 4  {{displayIcon name="world"/}} [[Website>>https://erumdatahub.de/]]
7 +
8 +//{{icon name="info-circle"/}}//ErUM =** Er**forschung von** U**niversum & **M**aterie
9 +(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.
12 +== **Welcome** ==
8 8  
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 -Otherwise, you can always create an account and contribute improvements or novel content yourself. For now, the registration is not open to the puplic.
14 +==== ====
11 11  
12 -= What is new? =
16 +==== Welcome to the new ErUM-Data-Hub Wiki - a place for all ErUM-Data communities, to interact and share information with one another. ====
13 13  
14 -Have a look at our new comprehensive:
18 +This wiki will be launched and released for use in January 2025. Please note that further development is an ongoing effort. Further functions, content and interaction options are planned. **This wiki is for you, the ErUM-Data community**, and is intended to meet your needs. For optimal functionality, we are dependent on your input. We are always happy to receive feedback, suggestions and requests, which you are welcome to send to angela.warkentin@erumdatahub.de.
15 15  
20 +**We invite you to create an account and contribute improvements and contents yourself. Registration opens January 10th. **
21 +
22 +
23 +{{icon name="question-circle"}}{{/icon}}Further information, answers to all questions you may have regarding the ErUM-Data-Hub and more about our aims and work can be found on our [[website>>https://erumdatahub.de/]].
24 +
25 +
26 +== What is new? ==
27 +
28 +Have a look at our new comprehensive material collection and People in ErUM-Data list:
29 +
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  
19 -= ErUM-Data Calendar =
33 += =
20 20  
35 +== ErUM-Data Calendar ==
36 +
21 21  {{velocity output="false"}}
22 22  $xwiki.ssx.use("Calendar.FullCalendar")
23 23  $xwiki.jsx.use("Calendar.FullCalendar", {'defer': false})
jahreskalender_2024_v14.xlsx
Author
... ... @@ -1,1 +1,0 @@
1 -XWiki.JudithSteinfeld
Size
... ... @@ -1,1 +1,0 @@
1 -25.5 KB
Content
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;
... ... @@ -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,22 +69,38 @@
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 e = E("div", v.title);
79 + const e = E("div", E("a", {href: v.url}, v.title));
76 76   e.style.height = `${100 * d}%`;
77 77   if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
78 78   if (v.textColor) e.style.color = v.textColor;
83 + if (v.start.isBefore(ms)) e.classList.add("fc-cut-start");
84 + if (me.isBefore(v.end)) e.classList.add("fc-cut-end");
79 79   oc.push(e);
80 - // 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 + }
81 81   }
82 82   }
83 83  
99 + scu = scu.map(u => Math.max(0, u - 1));
100 + if (!scu.some()) {scc = []; scu = [];}
101 +
84 84   const style = bgc[day] && `background-color: ${bgc[day]};`;
85 85   const dc = this.getDayClasses(ds);
86 - const da = sub => ({class: dc.concat(sub).join(" "), style});
87 - 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)));
88 88   days[day].push(E("td", da("fc-mainVal"), oc));
89 89   if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
90 90   } else
... ... @@ -133,14 +133,20 @@
133 133   right: "month,monthCols",
134 134   },
135 135   timeFormat: "H:mm",
136 - defaultView: "month",
154 + defaultView: "monthCols",
137 137   firstDay: "1",
138 138   minTime: "8:00",
139 139   maxTime: "23:00",
140 - defaultDate: "2024-11-06",
158 + validRange: {
159 + start: '2022-01-01',
160 + end: '2027-01-01',
161 + },
141 141   editable: false,
142 142   eventDataTransform: event => {
143 - if (event.url.split("/")[4] === "Holidays") event.rendering = "background";
164 + const cal = event.url.split("/")[4];
165 + if (cal === "Holidays" || cal == "Blocked" || cal.includes("Conference")) event.rendering = "background";
166 + event.viewUrl = event.url;
167 + event.url = event.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1] ?? event.url;
144 144   return event;
145 145   },
146 146   eventRender: function (event, element) {
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,64 @@
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: #7f95aa;
63 + cursor: default;
64 + }
65 + td.fc-dayVal {
66 + font-size: small;
67 + }
24 24   td.fc-weekVal {
69 + font-size: smaller;
25 25   text-align: right;
26 26   }
27 - .fc-fade {
28 - opacity: 0.3;
29 - }
30 - }
31 - }
72 + }
73 + }
32 32  }