Changes for page Home
Last modified by Benjamin Fischer on 2025/06/04 14:20
From version 73.20
edited by Benjamin Fischer
on 2024/11/08 14:04
on 2024/11/08 14:04
Change comment:
There is no comment for this version
To version 73.13
edited by Benjamin Fischer
on 2024/11/07 17:19
on 2024/11/07 17:19
Change comment:
There is no comment for this version
Summary
-
Objects (2 modified, 0 added, 0 removed)
Details
- XWiki.JavaScriptExtension[0]
-
- Code
-
... ... @@ -45,20 +45,12 @@ 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"})); 49 - cols.push(E("col")); 50 - if (wf) cols.push(E("col", {class: "fc-fitCol"})); 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"})); 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); 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 - }; 62 62 63 63 for (const day of range(31)) { 64 64 if (day < md) { ... ... @@ -71,10 +71,8 @@ 71 71 const d = Math.ceil(v.end.max(me).diff(ds, "days", true)); 72 72 if (v.rendering == "background") { 73 73 if (v.color) 74 - for (const i of range(d)) {66 + for (const i of range(d)) 75 75 bgc[day + i] = v.color; 76 - bgt[day + i] = v.title; 77 - } 78 78 } else { 79 79 const href = v.html.match(/<span class="wikiexternallink"><a href="([^"]+)">\1</)?.[1] ?? v.url; 80 80 const e = E("div", E("a", {href}, v.title)); ... ... @@ -84,26 +84,14 @@ 84 84 if (v.start.isBefore(ms)) e.classList.add("fc-cut-start"); 85 85 if (me.isBefore(v.end)) e.classList.add("fc-cut-end"); 86 86 oc.push(e); 87 - const i = scu.indexOf(0); 88 - if (i < 0) { 89 - scc.push([e]); 90 - scu.push(d); 91 - scc.forEach((els, col) => els.forEach(scs(col))); 92 - } else { 93 - scc[i].push(e); 94 - scu[i] = d; 95 - scs(i)(e); 96 - } 77 + // TODO: soft-columns 97 97 } 98 98 } 99 99 100 - scu = scu.map(u => Math.max(0, u - 1)); 101 - if (!scu.some()) {scc = []; scu = [];} 102 - 103 103 const style = bgc[day] && `background-color: ${bgc[day]};`; 104 104 const dc = this.getDayClasses(ds); 105 - const da = (sub,title=bgt[day] ?? null) => ({class: dc.concat(sub).join(" "), style, title});106 - if (df) days[day].push(E("td", da("fc-dayVal" , ds.format("D")), ds.format(df)));83 + const da = sub => ({class: dc.concat(sub).join(" "), style}); 84 + if (df) days[day].push(E("td", da("fc-dayVal"), ds.format(df))); 107 107 days[day].push(E("td", da("fc-mainVal"), oc)); 108 108 if (wf) days[day].push(E("td", da("fc-weekVal"), ds.weekday() ? "" : ds.format(wf))); 109 109 } else ... ... @@ -156,6 +156,7 @@ 156 156 firstDay: "1", 157 157 minTime: "8:00", 158 158 maxTime: "23:00", 137 + defaultDate: "2024-11-06", 159 159 editable: false, 160 160 eventDataTransform: event => { 161 161 if (event.url.split("/")[4] === "Holidays") event.rendering = "background";
- XWiki.StyleSheetExtension[0]
-
- Code
-
... ... @@ -13,6 +13,7 @@ 13 13 } 14 14 tbody.fc-body { 15 15 td { 16 + background-color: #fff; 16 16 &.fc-sat, &.fc-sun { 17 17 background-color: @weekend-color; 18 18 &.fc-dayVal { ... ... @@ -27,7 +27,7 @@ 27 27 border-top: 1px solid #bbb; 28 28 } 29 29 tr:hover > th { 30 - background-color:#ccc;31 + filter: brightness(0.8); 31 31 } 32 32 td.fc-mainVal { 33 33 position: relative; ... ... @@ -46,7 +46,7 @@ 46 46 border-bottom-right-radius: 0px; 47 47 } 48 48 &:hover { 49 - width: auto !important;50 + width: auto; 50 50 max-width: 10vw; 51 51 height: auto !important; 52 52 z-index: 10; ... ... @@ -61,11 +61,7 @@ 61 61 td.fc-dayVal, td.fc-weekVal { 62 62 color: desaturate(lighten(#1D3B58, 50%), 80%); 63 63 } 64 - td.fc-dayVal { 65 - font-size: small; 66 - } 67 67 td.fc-weekVal { 68 - font-size: smaller; 69 69 text-align: right; 70 70 } 71 71 }