Skip to Content

Changes for page Home

Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 73.18
edited by Benjamin Fischer
on 2024/11/08 13:58
Change comment: There is no comment for this version
To version 78.1
edited by Judith Steinfeld
on 2024/11/12 08:29
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,7 +1,10 @@
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>>https://wiki.erumdatahub.de/de/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 7  Welcome to the new ErUM-Data-Hub Wiki - a place for all ErUM-Data communities, to interact and share information with one another.
... ... @@ -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  
22 += =
23 +
19 19  = ErUM-Data Calendar =
20 20  
21 21  {{velocity output="false"}}
XWiki.JavaScriptExtension[0]
Code
... ... @@ -45,12 +45,13 @@
45 45   const md = me.diff(ms, "days");
46 46   const mv = yv.filter(t => ms.isBefore(t.end) && t.start.isBefore(me));
47 47  
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"}));
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"}));
51 51   head.push(E("th", {colspan}, ms.format(cf)));
52 52  
53 53   const bgc = new Array(md);
54 + const bgt = new Array(md);
54 54   let scc = [];
55 55   let scu = [];
56 56   const scs = col => el => {
... ... @@ -70,11 +70,12 @@
70 70   const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
71 71   if (v.rendering == "background") {
72 72   if (v.color)
73 - for (const i of range(d))
74 + for (const i of range(d)) {
74 74   bgc[day + i] = v.color;
76 + bgt[day + i] = v.title;
77 + }
75 75   } else {
76 - const href = v.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1] ?? v.url;
77 - const e = E("div", E("a", {href}, v.title));
79 + const e = E("div", E("a", {href: v.url}, v.title));
78 78   e.style.height = `${100 * d}%`;
79 79   if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
80 80   if (v.textColor) e.style.color = v.textColor;
... ... @@ -99,8 +99,8 @@
99 99  
100 100   const style = bgc[day] && `background-color: ${bgc[day]};`;
101 101   const dc = this.getDayClasses(ds);
102 - const da = sub => ({class: dc.concat(sub).join(" "), style});
103 - 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)));
104 104   days[day].push(E("td", da("fc-mainVal"), oc));
105 105   if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));
106 106   } else
... ... @@ -155,7 +155,10 @@
155 155   maxTime: "23:00",
156 156   editable: false,
157 157   eventDataTransform: event => {
158 - 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;
159 159   return event;
160 160   },
161 161   eventRender: function (event, element) {
XWiki.StyleSheetExtension[0]
Code
... ... @@ -59,7 +59,8 @@
59 59   }
60 60   }
61 61   td.fc-dayVal, td.fc-weekVal {
62 - color: desaturate(lighten(#1D3B58, 50%), 80%);
62 + color: #7f95aa;
63 + cursor: default;
63 63   }
64 64   td.fc-dayVal {
65 65   font-size: small;