Changes for page Home
Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 72.75
edited by Benjamin Fischer
on 2024/11/07 13:40
on 2024/11/07 13:40
Change comment:
There is no comment for this version
To version 73.7
edited by Benjamin Fischer
on 2024/11/07 17:05
on 2024/11/07 17:05
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
-
Objects (2 modified, 0 added, 0 removed)
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,7 +35,6 @@ 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 38 - 39 39 const cols = []; 40 40 const head = []; 41 41 const days = Array(31).fill().map(_ => []); ... ... @@ -73,10 +73,13 @@ 73 73 for (const i of range(d)) 74 74 bgc[day + i] = v.color; 75 75 } else { 76 - 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)); 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; 74 + if (v.start.isBefore(ms)) e.classList.add("fc-cut-start"); 75 + if (me.isBefore(v.end)) e.classList.add("fc-cut-end"); 80 80 oc.push(e); 81 81 // TODO: soft-columns 82 82 } ... ... @@ -84,10 +84,10 @@ 84 84 85 85 const style = bgc[day] && `background-color: ${bgc[day]};`; 86 86 const dc = this.getDayClasses(ds); 87 - const d s= sub => ({class: dc.concat(sub).join(" "), style});88 - if (df) days[day].push(E("td", d s("fc-dayVal"), ds.format(df)));89 - days[day].push(E("td", d s("fc-mainVal"), oc));90 - if (wf) days[day].push(E("td", d s("fc-weekVal"), ds.weekday() ? "" : ds.format(wf)));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))); 91 91 } else 92 92 days[day].push(E("td", {colspan})); 93 93 } ... ... @@ -134,7 +134,7 @@ 134 134 right: "month,monthCols", 135 135 }, 136 136 timeFormat: "H:mm", 137 - defaultView: "month", 133 + defaultView: "monthCols", 138 138 firstDay: "1", 139 139 minTime: "8:00", 140 140 maxTime: "23:00",
- 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,59 @@ 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 + 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 { 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; 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: desaturate(lighten(#1D3B58, 50%), 80%); 63 + } 24 24 td.fc-weekVal { 25 25 text-align: right; 26 26 } 27 - .fc-fade { 28 - opacity: 0.3; 29 - } 30 - } 31 - } 67 + } 68 + } 32 32 }