The first pages in the notebook's own format: tables, fixtures, strengths, scorers, fair play, indoor

A page of the notebook is 1244 x 720 design units under the sheet's heading; its
building blocks (panels, tables, pills, pickers, meters, dialogs) are in pages.inc
and pages.rcss with the notebook's inks for all three skins. The league reports
are laid out in it; the other menus stay scaled sheets until they follow. The
older dialogs take the same cream note with round corners and pill buttons.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
MichaelandClaude Fable 5.2 committed 2026-11-15 17:23:20 +01:00
1 parent fc2974084c
commit ac455eabfe
12 files changed
+479 -351

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
<rml>
<head><title>Dreierpack Manager</title><link type="text/rcss" href="theme.rcss"/><link type="text/rcss" href="ticket.rcss"/><link type="text/rcss" href="sports.rcss"/><link type="text/rcss" href="calendar.rcss"/><link type="text/rcss" href="reports.rcss"/><link type="text/rcss" href="report_details.rcss"/><link type="text/rcss" href="report_pickers.rcss"/><link type="text/rcss" href="indoor.rcss"/><link type="text/rcss" href="planning.rcss"/><link type="text/rcss" href="almanac.rcss"/><link type="text/rcss" href="finance.rcss"/>
<link type="text/rcss" href="bank.rcss"/><link type="text/rcss" href="contracts.rcss"/><link type="text/rcss" href="amount.rcss"/><link type="text/rcss" href="environment.rcss"/><link type="text/rcss" href="advertising.rcss"/><link type="text/rcss" href="toto.rcss"/><link type="text/rcss" href="lineup.rcss"/><link type="text/rcss" href="transfer.rcss"/><link type="text/rcss" href="career_reports.rcss"/><link type="text/rcss" href="rankings.rcss"/><link type="text/rcss" href="stadium.rcss"/><link type="text/rcss" href="statistics.rcss"/><link type="text/rcss" href="news.rcss"/><link type="text/rcss" href="settings.rcss"/><link type="text/rcss" href="widgets.rcss"/><link type="text/rcss" href="files.rcss"/><link type="text/rcss" href="front.rcss"/><link type="text/rcss" href="entry.rcss"/><link type="text/rcss" href="career.rcss"/><link type="text/rcss" href="national.rcss"/><link type="text/rcss" href="opening.rcss"/><link type="text/rcss" href="select_menu.rcss"/><link type="text/rcss" href="live.rcss"/><link type="text/rcss" href="postmatch.rcss"/><link type="text/rcss" href="notebook.rcss"/></head>
<link type="text/rcss" href="bank.rcss"/><link type="text/rcss" href="contracts.rcss"/><link type="text/rcss" href="amount.rcss"/><link type="text/rcss" href="environment.rcss"/><link type="text/rcss" href="advertising.rcss"/><link type="text/rcss" href="toto.rcss"/><link type="text/rcss" href="lineup.rcss"/><link type="text/rcss" href="transfer.rcss"/><link type="text/rcss" href="career_reports.rcss"/><link type="text/rcss" href="rankings.rcss"/><link type="text/rcss" href="stadium.rcss"/><link type="text/rcss" href="statistics.rcss"/><link type="text/rcss" href="news.rcss"/><link type="text/rcss" href="settings.rcss"/><link type="text/rcss" href="widgets.rcss"/><link type="text/rcss" href="files.rcss"/><link type="text/rcss" href="front.rcss"/><link type="text/rcss" href="entry.rcss"/><link type="text/rcss" href="career.rcss"/><link type="text/rcss" href="national.rcss"/><link type="text/rcss" href="opening.rcss"/><link type="text/rcss" href="select_menu.rcss"/><link type="text/rcss" href="live.rcss"/><link type="text/rcss" href="postmatch.rcss"/><link type="text/rcss" href="notebook.rcss"/><link type="text/rcss" href="pages.rcss"/></head>
<body class="midnight">
<div id="background"></div>
<div id="canvas"></div>
+197
View File
@@ -0,0 +1,197 @@
/* SPDX-License-Identifier: GPL-3.0-only */
/* The pages of the notebook: one sheet of 1244 x 720 design units (1 unit = 2.25 dp), that is
2799 x 1620 dp, under the page's heading. Building blocks shared by all pages: panels, tables,
buttons, tabs, pickers, meters, dialogs. The inks are the notebook's (cream, terracotta, sage);
the dark skins replace the ramps and nothing else. */
body {--p-bg:#23262d;--p-surf:#343842;--p-text:#f0ece2;--p-div:#f0ece233;--p-shade:#00000059;
--p-n1:#2a2d34;--p-n2:#30343c;--p-n3:#3d424c;--p-n4:#525966;--p-n5:#6f7684;--p-n6:#8f95a1;--p-n7:#b1b6bf;--p-n8:#d2d6dc;--p-n9:#f0ece2;
--p-a1:#3b2f27;--p-a2:#4d3826;--p-a3:#6e4827;--p-a4:#b9773c;--p-a5:#d08d4c;--p-a6:#e0a25f;--p-a7:#ebb87f;--p-a8:#f3d0a8;--p-a9:#fbead4;
--p-s1:#2b3526;--p-s2:#35412c;--p-s3:#455437;--p-s4:#5d7048;--p-s5:#7c9062;--p-s6:#9db382;--p-s7:#b9cba0;--p-s8:#d3e0bf;--p-s9:#e9f1dc;
--p-accent:#e0a25f;--p-on-accent:#23262d;--p-row:#f0ece20a;--p-rule:#f0ece21c;}
body.silver {--p-bg:#f5ead8;--p-surf:#ebddc5;--p-text:#201e1d;--p-div:#201e1d29;--p-shade:#2e2b2557;
--p-n1:#f9f4ed;--p-n2:#eee7db;--p-n3:#dcd3c4;--p-n4:#c0b6a5;--p-n5:#a19786;--p-n6:#82796a;--p-n7:#645c50;--p-n8:#474238;--p-n9:#2e2b25;
--p-a1:#fff2eb;--p-a2:#ffe1d0;--p-a3:#ffc6a5;--p-a4:#f6a06b;--p-a5:#d67f48;--p-a6:#b2622d;--p-a7:#8c491a;--p-a8:#643312;--p-a9:#402310;
--p-s1:#f0fae1;--p-s2:#e1eecc;--p-s3:#ccdbb2;--p-s4:#aebf92;--p-s5:#8fa073;--p-s6:#728157;--p-s7:#56633f;--p-s8:#3d472b;--p-s9:#272e1b;
--p-accent:#c67139;--p-on-accent:#f9f4ed;--p-row:#201e1d0a;--p-rule:#201e1d17;}
body.matchday {--p-bg:#e4eed6;--p-surf:#cfe0b8;--p-text:#1d2a16;--p-div:#1d2a162e;--p-shade:#232d1c57;
--p-n1:#f1f6e8;--p-n2:#e2ecd4;--p-n3:#cddbbb;--p-n4:#afc09a;--p-n5:#8c9e78;--p-n6:#6d7f5b;--p-n7:#526345;--p-n8:#3a4830;--p-n9:#232d1c;
--p-a1:#e6f3df;--p-a2:#cfe8c4;--p-a3:#a9d39a;--p-a4:#7dba6c;--p-a5:#58a049;--p-a6:#3f7a3a;--p-a7:#2f602c;--p-a8:#214720;--p-a9:#152f15;
--p-s1:#fff2e6;--p-s2:#ffe0c4;--p-s3:#f9c596;--p-s4:#eda565;--p-s5:#d6853f;--p-s6:#b2682a;--p-s7:#8c4f1c;--p-s8:#643712;--p-s9:#40230d;
--p-accent:#3f7a3a;--p-on-accent:#f1f6e8;--p-row:#1d2a160a;--p-rule:#1d2a1617;}
/* --- the sheet --- */
.window.nb-sheet.pg-root {left:558dp;top:400.5dp;width:2799dp;height:1620dp;transform:none;overflow:visible;font-size:30dp;line-height:42dp;color:var(--p-text);
--text:var(--p-text);--muted:var(--p-n7);--border:var(--p-div);--accent:var(--p-a7);}
.pg-root>.content {position:absolute;left:0;top:0;right:auto;bottom:auto;width:2799dp;height:1620dp;overflow:visible;}
.pg-page {position:absolute;left:0;top:0;width:2799dp;height:1620dp;display:flex;flex-direction:column;gap:27dp;}
.pg-body {display:flex;flex:1;gap:36dp;min-height:0;}
.pg-col {display:flex;flex-direction:column;gap:27dp;min-width:0;min-height:0;}
.pg-row {display:flex;align-items:center;gap:27dp;min-width:0;}
.pg-grow {flex:1;min-width:0;min-height:0;}
.pg-foot {display:flex;flex:none;align-items:center;gap:18dp;height:81dp;padding-right:130dp;}
.pg-sp {display:block;flex:1;}
.pg-status {display:block;max-width:1500dp;height:60dp;line-height:60dp;padding:0 27dp;border-radius:30dp;background-color:var(--p-n1);font-size:28dp;color:var(--p-n8);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.pg-panel {display:block;background-color:var(--p-n1);border:2dp var(--p-div);border-radius:45dp;padding:32dp 36dp;}
.pg-panel.pg-col,.pg-surf.pg-col {display:flex;}
.pg-panel.pg-row,.pg-surf.pg-row {display:flex;}
.pg-surf {display:block;background-color:var(--p-surf);border-radius:45dp;padding:32dp 36dp;}
.pg-k {display:block;font-size:25dp;line-height:34dp;letter-spacing:2.5dp;font-weight:bold;color:var(--p-a7);white-space:nowrap;}
.pg-h {display:block;margin:0;font-family:Display;font-weight:normal;font-size:43dp;line-height:50dp;}
.pg-h.large {font-size:58dp;line-height:66dp;}
.pg-big {display:block;font-family:Display;font-weight:normal;font-size:68dp;line-height:72dp;}
.pg-mut {color:var(--p-n7);}
.pg-r {text-align:right;} .pg-c {text-align:center;}
.pg-nowrap {white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.pg-empty {display:flex;flex:1;align-items:center;justify-content:center;padding:54dp;text-align:center;font-size:34dp;color:var(--p-n7);}
.pg-heading {display:flex;flex:none;align-items:flex-end;gap:27dp;height:66dp;}
.pg-heading .pg-mut {display:block;line-height:50dp;white-space:nowrap;}
/* --- buttons --- */
.pg-root button {font-family:Modern;font-size:30dp;color:var(--p-text);}
.pg-btn,.pg-btn:disabled {display:flex;flex:none;align-items:center;justify-content:center;height:68dp;padding:0 32dp;border:2dp var(--p-div);border-radius:36dp;background-color:var(--p-n1);decorator:none;font-family:Display;font-size:31dp;line-height:40dp;color:var(--p-text);white-space:nowrap;}
.pg-btn:hover {background-color:var(--p-n2);decorator:none;border-color:var(--p-div);}
.pg-btn.primary,.pg-btn.primary:disabled {background-color:var(--p-accent);border-color:var(--p-accent);color:var(--p-on-accent);}
.pg-btn.primary:hover {background-color:var(--p-a6);border-color:var(--p-a6);}
.pg-btn.on,.pg-btn.on:hover {background-color:var(--p-a2);border-color:var(--p-a6);color:var(--p-a9);}
.pg-btn.round {width:68dp;padding:0;font-size:44dp;}
.pg-btn.block {flex:1;}
.pg-btn:disabled {opacity:.45;}
.pg-btn .control-label,.pg-btn span {display:block;white-space:nowrap;}
.pg-link,.pg-link:hover,.pg-link:disabled {display:flex;flex:none;align-items:center;gap:16dp;max-width:100%;height:auto;padding:0;border:0dp;border-radius:18dp;background-color:transparent;decorator:none;font-family:Modern;font-size:30dp;font-weight:bold;color:var(--p-text);text-align:left;}
.pg-link:hover {color:var(--p-a7);}
.pg-link span {display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.pg-link.reverse {flex-direction:row-reverse;text-align:right;}
.pg-link.plain {font-weight:normal;}
/* a row of choices in one pill */
.pg-seg {display:flex;flex:none;height:64dp;border:2dp var(--p-div);border-radius:34dp;overflow:hidden;background-color:var(--p-n1);}
.pg-seg button,.pg-seg button:disabled {display:block;height:60dp;line-height:60dp;padding:0 29dp;border:0dp;border-left:2dp var(--p-div);border-radius:0dp;background-color:transparent;decorator:none;font-size:29dp;font-weight:bold;white-space:nowrap;color:var(--p-text);}
.pg-seg button.first {border-left-width:0dp;}
.pg-seg button:hover {background-color:var(--p-n2);}
.pg-seg button.on,.pg-seg button.on:hover {background-color:var(--p-a2);color:var(--p-a9);}
.pg-seg button:disabled {opacity:.45;}
.pg-seg button span {display:block;}
/* tabs inside a page */
.pg-tabs {display:flex;flex:none;gap:14dp;}
.pg-tabs button,.pg-tabs button:disabled {display:block;height:62dp;line-height:62dp;padding:0 36dp;border:0dp;border-radius:32dp 32dp 9dp 9dp;background-color:var(--p-n2);decorator:none;font-family:Display;font-size:34dp;color:var(--p-n8);white-space:nowrap;}
.pg-tabs button:hover {background-color:var(--p-n3);}
.pg-tabs button.on,.pg-tabs button.on:hover {background-color:var(--p-a2);color:var(--p-a9);}
.pg-tabs button:disabled {opacity:.45;}
.pg-tabs button span {display:block;}
/* a tag */
.pg-tag {display:block;flex:none;height:44dp;line-height:44dp;padding:0 22dp;border-radius:27dp;background-color:var(--p-n2);font-size:25dp;white-space:nowrap;color:var(--p-n9);}
.pg-tag.accent {background-color:var(--p-a2);color:var(--p-a8);}
.pg-tag.sage {background-color:var(--p-s2);color:var(--p-s8);}
/* --- pickers in the foot of a page (the list opens upwards) --- */
.pg-root .report-picker-wrapper.pg-dd {position:relative;left:auto;bottom:auto;flex:none;height:68dp;overflow:visible;}
.pg-root .pg-dd .report-picker-trigger,.pg-root .pg-dd .report-picker-trigger:disabled {display:flex;align-items:center;justify-content:flex-start;gap:14dp;width:auto;height:68dp;padding:0 30dp;border:2dp var(--p-div);border-radius:36dp;background-color:var(--p-n1);decorator:none;font-family:Display;font-size:31dp;color:var(--p-text);}
.pg-root .pg-dd .report-picker-trigger:hover {background-color:var(--p-n2);decorator:none;}
.pg-dd-l {display:block;flex:none;font-family:Modern;font-size:25dp;letter-spacing:1.5dp;color:var(--p-n7);}
.pg-root .pg-dd .report-picker-label {flex:none;max-width:900dp;}
.pg-root .pg-dd .report-picker-arrow {width:24dp;height:24dp;}
.pg-root .pg-dd .report-picker-arrow span {left:5dp;top:2dp;width:11dp;height:11dp;border-color:var(--p-n8);}
.pg-root .pg-dd .report-picker-popup {left:0;right:auto;bottom:82dp;min-width:100%;width:auto;max-height:742dp;padding:14dp;border:2dp var(--p-div);border-radius:36dp;background-color:var(--p-n1);z-index:60;}
.pg-root .pg-dd .report-picker-popup .report-picker-option {height:60dp;min-height:60dp;padding:0 27dp 0 14dp;border-radius:22dp;font-family:Modern;font-size:30dp;color:var(--p-text);white-space:nowrap;}
.pg-root .pg-dd .report-picker-popup .report-picker-option:hover,.pg-root .pg-dd .report-picker-popup .report-picker-option:focus {background-color:var(--p-a1);}
.pg-root .pg-dd .report-picker-popup .report-picker-option[aria-checked=true] {font-weight:bold;}
.pg-root .pg-dd .report-picker-check {border-color:var(--p-a7);}
.pg-root .pg-dd .report-picker-option-label {overflow:visible;}
/* --- tables: rows of cells; the head stays, the body scrolls --- */
.pg-t {display:flex;flex-direction:column;flex:1;min-height:0;font-size:30dp;}
.pg-thead {display:flex;flex:none;align-items:center;height:70dp;border-bottom:3dp var(--p-n4);}
.pg-th,.pg-th:hover {display:block;flex:none;height:auto;padding:0 18dp;border:0dp;border-radius:0dp;background-color:transparent;decorator:none;font-family:Modern;font-size:24dp;line-height:34dp;letter-spacing:1.7dp;font-weight:bold;color:var(--p-n7);text-align:left;white-space:nowrap;}
button.pg-th:hover {color:var(--p-a7);}
.pg-th.flex,.pg-td.flex {flex:1;min-width:0;}
.pg-th.r,.pg-td.r {text-align:right;} .pg-th.c,.pg-td.c {text-align:center;}
.pg-th span {display:block;}
.pg-tbody {display:block;flex:1;min-height:0;overflow-y:auto;overflow-x:hidden;}
.pg-tbody.even {display:flex;flex-direction:column;justify-content:space-around;}
.pg-tr {display:flex;flex:none;align-items:center;height:70dp;border-bottom:2dp var(--p-rule);}
.pg-tr:hover {background-color:var(--p-row);}
.pg-tr.me {background-color:var(--p-a1);font-weight:bold;}
.pg-tr.sel {background-color:var(--p-a2);}
.pg-tr.grp {height:58dp;background-color:var(--p-surf);}
.pg-tr.grp .pg-td {font-size:24dp;letter-spacing:2.4dp;font-weight:bold;color:var(--p-a8);}
.pg-tr.z-eu {background-color:var(--p-s1);} .pg-tr.z-auf {background-color:var(--p-s2);} .pg-tr.z-ab {background-color:var(--p-a2);}
.pg-tr.me.z-eu,.pg-tr.me.z-auf {background-color:var(--p-s3);} .pg-tr.me.z-ab {background-color:var(--p-a3);}
.pg-td {display:block;flex:none;padding:0 18dp;white-space:nowrap;overflow:hidden;}
.pg-td.cell {display:flex;align-items:center;gap:18dp;}
.pg-td.cell.r {justify-content:flex-end;} .pg-td.cell.c {justify-content:center;}
.pg-td b,.pg-td strong {font-weight:bold;}
.pg-num {display:block;font-family:Display;font-weight:normal;font-size:38dp;line-height:44dp;}
.pg-zone {display:block;flex:none;width:14dp;height:45dp;border-radius:7dp;}
.pg-zone.eu {background-color:var(--p-s6);} .pg-zone.auf {background-color:var(--p-s8);} .pg-zone.ab {background-color:var(--p-a7);}
.pg-rank {display:block;flex:none;width:50dp;text-align:right;font-weight:bold;}
/* the position of a player */
.pg-pos {display:block;flex:none;width:86dp;height:38dp;line-height:38dp;border-radius:20dp;font-size:24dp;font-weight:bold;text-align:center;background-color:var(--p-n2);color:var(--p-n9);}
.pg-pos.TW {background-color:var(--p-n3);} .pg-pos.ABW {background-color:var(--p-s2);color:var(--p-s9);} .pg-pos.MIT {background-color:var(--p-a2);color:var(--p-a9);} .pg-pos.STU {background-color:var(--p-a7);color:var(--p-n1);}
/* the last matches as marks */
.pg-form {display:flex;flex:none;gap:7dp;}
.pg-form span {display:block;width:38dp;height:38dp;line-height:38dp;border-radius:19dp;font-size:21dp;font-weight:bold;text-align:center;}
.pg-form .S {background-color:var(--p-s7);color:var(--p-n1);} .pg-form .U {background-color:var(--p-n3);color:var(--p-n9);} .pg-form .N {background-color:var(--p-a8);color:var(--p-n1);} .pg-form .X {background-color:transparent;border:2dp var(--p-n3);width:34dp;height:34dp;}
/* meters, marks, figures */
.pg-bar {display:block;flex:1;height:20dp;border-radius:10dp;background-color:var(--p-n3);overflow:hidden;}
.pg-bar div {height:20dp;border-radius:10dp;background-color:var(--p-accent);}
.pg-bar div.sage {background-color:var(--p-s6);} .pg-bar div.soft {background-color:var(--p-a5);}
.pg-dots {display:flex;flex:none;gap:7dp;}
.pg-dots span {display:block;width:20dp;height:20dp;border-radius:10dp;background-color:var(--p-n3);}
.pg-dots span.on {background-color:var(--p-a6);}
.pg-stat {display:flex;flex-direction:column;flex:1;min-width:0;padding:22dp 32dp;border:2dp var(--p-div);border-radius:40dp;background-color:var(--p-n1);}
.pg-stat strong {display:block;margin-top:4dp;font-family:Display;font-weight:normal;font-size:54dp;line-height:60dp;white-space:nowrap;}
.pg-stat small {display:block;margin-top:4dp;font-size:26dp;line-height:34dp;color:var(--p-n7);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.pg-kv {display:flex;justify-content:space-between;gap:32dp;font-size:29dp;line-height:44dp;}
.pg-kv span {display:block;color:var(--p-n7);white-space:nowrap;}
.pg-kv strong {display:block;font-weight:bold;text-align:right;white-space:nowrap;}
.pg-legend {display:flex;flex:none;gap:32dp;font-size:27dp;color:var(--p-n8);}
.pg-legend-item {display:flex;align-items:center;gap:14dp;}
.pg-legend-item span {display:block;white-space:nowrap;}
.pg-legend-mark {display:block;width:27dp;height:27dp;border-radius:9dp;}
.pg-card,.pg-card:disabled {display:flex;flex-direction:column;gap:14dp;padding:27dp 32dp;border:2dp var(--p-div);border-radius:45dp;background-color:var(--p-n1);decorator:none;text-align:left;font-family:Modern;font-size:30dp;color:var(--p-text);}
.pg-card:hover {border-color:var(--p-a6);background-color:var(--p-n1);decorator:none;}
.pg-card.sel,.pg-card.sel:hover {background-color:var(--p-a1);border-color:var(--p-a6);}
.pg-card:disabled {opacity:.5;}
.pg-score {display:block;font-family:Display;font-size:36dp;line-height:42dp;white-space:nowrap;}
.pg-match {display:flex;flex:none;align-items:center;gap:22dp;height:112dp;padding:0 27dp;border-bottom:2dp var(--p-rule);}
.pg-match.me {background-color:var(--p-a1);border-radius:22dp;font-weight:bold;}
.pg-match-side {display:flex;flex:1;min-width:0;}
.pg-match-side.home {justify-content:flex-end;}
.pg-match-mid {display:block;flex:none;width:270dp;text-align:center;}
.pg-match-mid small {display:block;font-size:26dp;line-height:32dp;color:var(--p-n7);white-space:nowrap;}
.pg-match-head {display:flex;flex:none;gap:22dp;padding:0 27dp 14dp 27dp;border-bottom:3dp var(--p-n4);}
.pg-match-head .pg-k {flex:1;}
/* --- dialogs: a note laid on the dimmed book --- */
.pg-ov {position:absolute;left:0;top:0;width:3840dp;height:2160dp;z-index:400;display:flex;align-items:center;justify-content:center;background-color:var(--p-shade);font-size:30dp;line-height:42dp;color:var(--p-text);}
.pg-dlg {display:flex;flex-direction:column;gap:27dp;max-height:1980dp;padding:45dp 50dp;border:2dp var(--p-n4);border-radius:63dp;background-color:var(--p-bg);color:var(--p-text);}
.pg-dlg h2 {display:block;margin:0;font-family:Display;font-weight:normal;font-size:54dp;line-height:62dp;}
.pg-dlg-sub {display:block;margin-top:4dp;color:var(--p-n7);}
.pg-dlg p {display:block;margin:0;font-size:34dp;line-height:46dp;}
.pg-dlg-act {display:flex;justify-content:flex-end;align-items:center;gap:18dp;margin-top:9dp;}
.pg-ov button {font-family:Modern;font-size:30dp;color:var(--p-text);}
.pg-th-text {display:flex;align-items:center;gap:10dp;}
.pg-th.r .pg-th-text {justify-content:flex-end;} .pg-th.c .pg-th-text {justify-content:center;}
.pg-sort {display:block;width:0;height:0;border-left:8dp transparent;border-right:8dp transparent;}
.pg-sort.up {border-bottom:10dp var(--p-a7);} .pg-sort.down {border-top:10dp var(--p-a7);}
/* --- player statistics, fair play --- */
.pg-photo {display:block;flex:none;overflow:hidden;background-color:var(--p-n2);}
.pg-link.large {font-family:Modern;font-size:36dp;gap:27dp;}
.pg-lead.first {background-color:var(--p-a1);border-color:var(--p-a6);}
.pg-lead-place {flex:none;width:112dp;color:var(--p-a7);}
.pg-lead-person {display:flex;flex-direction:column;gap:9dp;align-items:flex-start;}
.pg-lead-of {display:block;flex:none;max-width:420dp;}
.pg-lead-figure {flex:none;min-width:90dp;text-align:right;}
.pg-card-mark.yellow {width:20dp;height:27dp;border-radius:4dp;background-color:#e9b949;}
.pg-card-mark.red {width:20dp;height:27dp;border-radius:4dp;background-color:#b3402f;}
/* --- the older dialogs in the same hand: cream note, round corners, pill buttons --- */
body .report-detail-layer,body .amount-layer,body .stadium-modal {background-color:var(--p-shade);}
body .report-detail-card,body .toto-dialog,body .planning-dialog,body .transfer-dialog,body .contracts-dialog,body .amount-box,body .career-history-dialog {border:2dp var(--p-n4);border-radius:63dp;background-color:var(--p-bg);decorator:none;box-shadow:none;color:var(--p-text);
--text:var(--p-text);--muted:var(--p-n7);--border:var(--p-div);--accent:var(--p-a7);--panel:var(--p-n1);--soft:var(--p-n1);--hover:var(--p-n2);--selected:var(--p-a2);--strong:var(--p-n1);--input:var(--p-n1);}
body .report-detail-card h2,body .toto-dialog h2,body .planning-dialog h2,body .transfer-dialog>h2,body .contracts-dialog h2,body .amount-box h2 {font-family:Display;font-weight:normal;letter-spacing:0dp;color:var(--p-text);}
body .report-detail-actions .report-detail-action,body .toto-dialog-actions button,body .planning-dialog-actions button,body .transfer-dialog-actions button,body .contract-dialog-actions button,body .stadium-dialog-action,body .amount-review-actions button {border:2dp var(--p-div);border-radius:40dp;background-color:var(--p-n1);decorator:none;font-family:Display;color:var(--p-text);}
body .report-detail-actions .report-detail-action:hover,body .toto-dialog-actions button:hover,body .planning-dialog-actions button:hover,body .transfer-dialog-actions button:hover,body .contract-dialog-actions button:hover,body .stadium-dialog-action:hover,body .amount-review-actions button:hover {background-color:var(--p-n2);decorator:none;}
body .toto-dialog-actions button.primary,body .planning-dialog-actions button.primary,body .transfer-dialog-actions button.primary,body .contract-dialog-actions button.primary,body .stadium-dialog-action.primary,body .amount-review-actions button.primary,body .amount-actions .amount-button.amount-accept {background-color:var(--p-accent);border-color:var(--p-accent);decorator:none;color:var(--p-on-accent);}
body .amount-button {border:2dp var(--p-div);border-radius:32dp;background-color:var(--p-n1);decorator:none;font-family:Display;color:var(--p-text);}
body .amount-button:hover {background-color:var(--p-a1);filter:none;}
+1 -133
View File
@@ -1,134 +1,2 @@
/* SPDX-License-Identifier: GPL-3.0-only */
.rankings-scorers,.rankings-fairplay {position:absolute;left:0;right:0;top:0;bottom:0;}
.rankings-heading {height:92dp;display:flex;align-items:center;justify-content:space-between;gap:30dp;}
.rankings-heading>div {display:flex;align-items:baseline;gap:24dp;min-width:0;flex:1;}
.rankings-heading h2 {font-size:38dp;font-weight:normal;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.rankings-heading span {font-size:28dp;white-space:nowrap;flex-shrink:0;}
.rankings-heading p {font-size:28dp;color:var(--muted);white-space:nowrap;flex-shrink:0;}
.rankings-tabs {position:absolute;left:0;right:0;top:104dp;height:106dp;display:flex;gap:8dp;border-bottom:2dp var(--border);}
.rankings-tab {position:relative;display:flex;align-items:center;justify-content:center;gap:20dp;flex:1;min-width:0;padding:0;border:0dp;border-radius:12dp 12dp 0dp 0dp;background-color:transparent;font-size:34dp;font-weight:normal;}
.rankings-tab:hover {background-color:var(--hover);}
.rankings-tab[aria-selected=true] {background-color:#8dbfaf0e;color:#c7eadf;}
.rankings-tab-underline {display:none;position:absolute;left:28dp;right:28dp;bottom:-2dp;height:5dp;border-radius:5dp 5dp 0dp 0dp;background-color:#a9dccb;}
.rankings-tab[aria-selected=true] .rankings-tab-underline {display:block;}
.rankings-tab-icon {display:flex;align-items:center;justify-content:center;width:34dp;height:34dp;flex-shrink:0;}
.rankings-card-icon {display:block;width:24dp;height:34dp;border-radius:4dp;transform:rotate(-7deg);}
.rankings-card-icon.yellow {background-color:#e0c56e;}
.rankings-card-icon.red {background-color:#dc8078;}
.rankings-panel {position:absolute;left:0;right:0;top:244dp;bottom:148dp;}
.rankings-leaders {display:flex;gap:24dp;height:320dp;}
.rankings-leader {position:relative;display:flex;align-items:center;gap:20dp;width:854.666667dp;flex-shrink:0;min-width:0;height:320dp;padding:58dp 28dp 26dp;border:2dp var(--border);border-radius:18dp;decorator:linear-gradient(145deg,#b7d4e90a,#12233242);}
.rankings-leader.first {border-color:#a9dccb5e;decorator:linear-gradient(145deg,#a9dccb12,#12233242);}
.rankings-leader-rank {position:absolute;left:28dp;top:22dp;font-size:28dp;color:var(--muted);}
.rankings-leader-person {display:flex;flex-direction:column;gap:24dp;flex:1;min-width:0;}
.rankings-player-button {display:flex;align-items:center;gap:26dp;width:100%;min-width:0;padding:0;border:0dp;border-radius:10dp;background-color:transparent;text-align:left;font-size:34dp;}
.rankings-player-button:hover {background-color:transparent;}
.rankings-player-button:focus-visible {background-color:var(--hover);}
.rankings-player-name {display:block;flex:1;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.rankings-photo {display:block;flex-shrink:0;border:2dp var(--border);border-radius:44dp;overflow:hidden;background-color:var(--panel);}
.rankings-leader .rankings-photo {border-radius:63dp;}
.rankings-photo .image-frame {max-width:100%;max-height:100%;}
.rankings-leader .rankings-player-button {gap:22dp;font-size:36dp;line-height:41.4dp;}
.rankings-leader .rankings-player-name {white-space:normal;max-height:124.2dp;overflow:hidden;}
.rankings-club-button {display:flex;align-items:center;width:100%;min-width:0;max-width:100%;padding:0;border:0dp;background-color:transparent;color:var(--muted);text-align:left;font-size:36dp;}
.rankings-club-button.current {color:var(--accent);}
.rankings-club-button:hover {background-color:transparent;}
.rankings-club-button:focus-visible {background-color:var(--hover);}
.rankings-club-button .club-label {width:100%;min-width:0;max-width:100%;gap:12dp;}
.rankings-club-button .image-frame {flex-shrink:0;}
.rankings-club-button .club-label>span {display:block;flex:1;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.rankings-leader .rankings-club-button {font-size:28dp;}
.rankings-leader-value {display:flex;flex-direction:column;align-items:center;justify-content:center;gap:14dp;width:146dp;flex-shrink:0;}
.rankings-leader-value strong {font-size:88dp;font-weight:normal;line-height:88dp;}
.rankings-leader-value>span {font-size:28dp;line-height:28.8dp;color:var(--muted);text-align:center;}
.kind-2 .rankings-leader-value strong {color:#e0c98b;}
.kind-3 .rankings-leader-value strong {color:#e3aaa2;}
.rankings-scorer-list {position:absolute;left:0;right:0;top:352dp;bottom:0;border:2dp var(--border);border-radius:18dp;background-color:#13263526;overflow-x:hidden;overflow-y:auto;}
.rankings-table {width:100%;}
.rankings-row {display:flex;align-items:stretch;height:118dp;font-size:36dp;}
.rankings-row>div {display:flex;align-items:center;flex:1;min-width:0;padding:12dp 28dp;overflow:hidden;}
.rankings-row>div:first-child {width:47%;flex:none;}
.rankings-row>div:last-child {width:290dp;flex:none;justify-content:center;}
.rankings-cell-value {display:block;width:100%;min-width:0;white-space:nowrap;}
.rankings-row>div:last-child .rankings-cell-value,.rankings-fair-row>div:not(:first-child) .rankings-cell-value {text-align:center;}
.rankings-row.rankings-head {height:74dp;font-size:28dp;}
.rankings-head {color:var(--muted);border-bottom:2dp var(--border);}
.rankings-row.striped,.rankings-fair-row.striped {background-color:var(--soft);}
.rankings-row:hover,.rankings-fair-row:hover {background-color:var(--hover);}
.rankings-rest-player {gap:24dp;}
.rankings-rest-player .rankings-player-button {flex:1;}
.rankings-scorer-list .rankings-player-button,.rankings-scorer-list .rankings-club-button {padding:2dp 6dp;color:var(--text);}
.rankings-scorer-list .rankings-club-button.current {color:var(--accent);}
.rankings-rank {display:block;width:64dp;flex-shrink:0;font-size:30dp;color:var(--muted);text-align:right;}
.rankings-footer .report-picker-trigger {font-size:30dp;}
.rankings-own-club {display:flex;align-items:center;width:1725.333333dp;height:94dp;max-width:1725.333333dp;padding-right:28dp;font-size:32dp;}
.rankings-own-club .club-label {min-width:0;max-width:1100dp;gap:14dp;}
.rankings-own-club .club-label>span {white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.rankings-empty {padding:28dp;font-size:30dp;color:var(--muted);}
.rankings-fair-heading {height:100dp;display:flex;align-items:center;justify-content:space-between;gap:24dp;font-size:30dp;color:var(--muted);}
.rankings-fair-heading>div {display:flex;gap:20dp;}
.rankings-fair-heading span {padding:12dp 20dp;border:2dp var(--border);border-radius:12dp;background-color:var(--panel);white-space:nowrap;}
.rankings-yellow {color:#e0cc92;}
.rankings-red {color:#dfa69d;}
.rankings-fair-list {position:absolute;left:0;right:0;top:130dp;bottom:0;border:2dp var(--border);border-radius:18dp;background-color:#12243140;overflow-x:hidden;overflow-y:auto;}
.rankings-fair-row {display:flex;align-items:stretch;height:66dp;font-size:36dp;}
.rankings-fair-row>div {display:flex;align-items:center;justify-content:center;width:15%;flex-shrink:0;min-width:0;padding:7dp 14dp;overflow:hidden;}
.rankings-fair-row>div:first-child {width:55%;justify-content:flex-start;gap:14dp;}
.rankings-fair-row>div:nth-child(2) {color:#e0cc92;}
.rankings-fair-row>div:nth-child(3) {color:#dfa69d;}
.rankings-fair-row:not(.rankings-head)>div:last-child {color:var(--accent);}
.rankings-fair-rank {display:block;width:64dp;flex-shrink:0;text-align:right;}
.rankings-fair-row .report-club-button {min-width:0;max-width:100%;}
.rankings-fair-row.rankings-head {font-size:30dp;}
body.midnight .rankings-row.striped,body.midnight .rankings-fair-row.striped {background-color:#e3edf605;}
body.midnight .rankings-row,body.midnight .rankings-fair-row {color:#d8e0e8;}
body.midnight .rankings-head {color:#a0aebc;}
.rankings-fair-row .report-club-button {color:var(--text);}
.rankings-fair-row .report-club-button.current {color:var(--accent);}
body.midnight .rankings-row:hover,body.midnight .rankings-fair-row:hover {background-color:#bad5f20d;}
body.silver .rankings-tab[aria-selected=true] {background-color:#e3d3a878;color:#193b52;}
body.silver .rankings-tab-underline {background-color:#e3d3a878;}
body.silver .rankings-leader {background-color:#fcf9f190;decorator:none;}
body.silver .rankings-leader.first {border-color:#8a7a5570;decorator:linear-gradient(145deg,#a9dccb12,#12233242);}
body.silver .rankings-scorer-list,body.silver .rankings-fair-list {background-color:#6b552a0c;}
body.silver .kind-2 .rankings-leader-value strong,body.silver .kind-3 .rankings-leader-value strong {color:#193b52;}
body.silver .rankings-yellow,body.silver .rankings-fair-row>div:nth-child(2) {color:#805b18;}
body.silver .rankings-red,body.silver .rankings-fair-row>div:nth-child(3) {color:#a23f45;}
body.matchday .rankings-tab[aria-selected=true] {background-color:#d48c7b26;color:#ffe5de;}
body.matchday .rankings-tab-underline {background-color:#d48c7b26;}
body.matchday .rankings-leader {background-color:#1d1e2466;decorator:none;}
body.matchday .rankings-leader.first {border-color:#e5a19770;decorator:linear-gradient(145deg,#a9dccb12,#12233242);}
body.matchday .rankings-scorer-list,body.matchday .rankings-fair-list {background-color:#f8e7e00a;}
body.matchday .kind-2 .rankings-leader-value strong,body.matchday .kind-3 .rankings-leader-value strong {color:#ffe5de;}
body.matchday .rankings-yellow,body.matchday .rankings-fair-row>div:nth-child(2) {color:#e1c68b;}
body.matchday .rankings-red,body.matchday .rankings-fair-row>div:nth-child(3) {color:#f0a6a7;}
/* Midnight component fallbacks from the current HTML reference. */
body.midnight .rankings-heading h2 {color:#e3ecf3;}
body.midnight .rankings-heading span {color:#a7becf;}
body.midnight .rankings-heading p {color:#8fa8ba;}
body.midnight .rankings-tab {color:#aebfcd;}
body.midnight .rankings-tab[aria-selected=true] {color:#c7eadf;}
body.midnight .rankings-leader {border-color:#c6dce82b;}
body.midnight .rankings-leader.first {border-color:#a9dccb5e;}
body.midnight .rankings-leader-rank {color:#9eb5c5;}
body.midnight .rankings-leader .rankings-player-button {color:#e0ebf3;}
body.midnight .rankings-leader .rankings-club-button {color:#a6bdce;}
body.midnight .rankings-leader-value strong {color:#e0ecf5;}
body.midnight .kind-2 .rankings-leader-value strong {color:#e0c98b;}
body.midnight .kind-3 .rankings-leader-value strong {color:#e3aaa2;}
body.midnight .rankings-leader-value>span {color:#9fb8c9;}
body.midnight .rankings-scorer-list,body.midnight .rankings-fair-list {border-color:#c5d9e726;}
body.midnight .rankings-fair-row:not(.rankings-head)>div:last-child {color:#b8dbd0;}
.rankings-leader .rankings-club-button.current {color:var(--muted);}
body.midnight .rankings-leader .rankings-club-button.current {color:#a6bdce;}
body.midnight .rankings-scorer-list .rankings-player-button,body.midnight .rankings-scorer-list .rankings-club-button,body.midnight .rankings-fair-row .report-club-button {color:#d8e0e8;}
body.midnight .rankings-scorer-list .rankings-club-button.current,body.midnight .rankings-fair-row .report-club-button.current {color:#a9dccb;}
.rankings-scorer-list .rankings-club-button .club-label {gap:14dp;}
body.silver .rankings-fair-list,body.matchday .rankings-fair-list {background-color:var(--panel);}
body.silver .rankings-row.striped,body.silver .rankings-fair-row.striped {background-color:#6b552a0c;}
body.matchday .rankings-row.striped,body.matchday .rankings-fair-row.striped {background-color:#f8e7e00a;}
/* Match the selected footer caption in the open menu, at every UI density. */
.rankings-footer .report-picker-popup .report-picker-option {font-size:30dp;}
/* Player statistics and fair play are pages of the notebook; their styles are in pages.rcss. */
+1 -1
View File
@@ -45,7 +45,7 @@ endif()
set(modern_assets "${CMAKE_BINARY_DIR}/assets/modern")
FetchContent_GetProperties(rmlui)
file(MAKE_DIRECTORY "${modern_assets}")
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss live.rcss transfer.rcss career_reports.rcss rankings.rcss stadium.rcss statistics.rcss news.rcss news-catalog.json settings.rcss widgets.rcss files.rcss front.rcss entry.rcss opening.rcss select_menu.rcss career.rcss national.rcss postmatch.rcss notebook.rcss)
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss live.rcss transfer.rcss career_reports.rcss rankings.rcss stadium.rcss statistics.rcss news.rcss news-catalog.json settings.rcss widgets.rcss files.rcss front.rcss entry.rcss opening.rcss select_menu.rcss career.rcss national.rcss postmatch.rcss notebook.rcss pages.rcss)
configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY)
endforeach()
+1
View File
@@ -229,6 +229,7 @@ void App::engine_render() {
if(menu_=="statistics")out+=render_statistics_trophy();
element("canvas")->SetProperty("overflow",statistics_trophy_.contains("asset")?"visible":"hidden");
setting_menu_markup_ = true;
notebook_finish(out);
element("canvas")->SetInnerRML(out); ++document_generation_;
setting_menu_markup_ = false;
sync_window_zoom();
+18 -37
View File
@@ -8,46 +8,27 @@ std::string App::render_indoor() {
for (const auto &row : engine_indoor_value_.at("rows")) values.push_back(row);
rows = sort_report_rows(std::move(values), sort);
} else rows = report_indoor_rows(*world_, state);
std::string body = "<div id=\"report-underlay\" class=\"report-underlay\">"
"<div id=\"report-list\" class=\"report-list indoor-list\">"
"<div class=\"report-table\" role=\"table\">"
"<div class=\"report-row report-head\" role=\"row\">";
for (const auto &[key, label] :
std::array<std::pair<std::string, std::string>, 2>{
{{"rank", "Pl. / Verein"}, {"points", "Punkte"}}}) {
const bool current = sort.at("key") == key;
const bool descending = sort.at("desc").get<bool>();
std::string indicator = "<span class=\"report-sort-symbol\">";
if (!current || !descending)
indicator += "<span class=\"report-sort-arrow up\"></span>";
if (!current || descending)
indicator += "<span class=\"report-sort-arrow down\"></span>";
indicator += "</span>";
body += "<div class=\"report-cell " + std::string(key == "rank" ? "first" : "") +
"\" role=\"columnheader\" aria-sort=\"" +
(current ? descending ? "descending" : "ascending" : "none") + "\">" +
btn("report-sort", "<span>" + esc(label) + "</span>" + indicator,
"report-sort", "id=\"report-sort-" + key + "\" data-id=\"" + key +
"\" aria-label=\"Nach " + esc(label) + " sortieren\"") + "</div>";
const auto own_id = engine_mode_ ? engine_data_.at("desktop").at("meta").at("scope").at("teamId").get<std::string>()
: snap().state.at("career").value("role", "club") == "club" ? manager(snap()).value("club", "") : std::string();
std::string body = "<div id=\"report-underlay\" class=\"pg-page\"><div class=\"pg-body\" style=\"justify-content:center;\">"
"<div class=\"pg-panel pg-col\" style=\"" + pg_css("width:720px;gap:0px;padding:4px 12px;") + "\"><div class=\"pg-t\" role=\"table\"><div class=\"pg-thead\" role=\"row\">";
for (const auto &[key, label] : std::array<std::pair<std::string, std::string>, 2>{{{"rank", "Pl. / Verein"}, {"points", "Punkte"}}}) {
const bool current = sort.at("key") == key, descending = sort.at("desc").get<bool>();
body += pg_th(label, key == "rank" ? 0 : 120, key == "rank" ? "" : "r", "report-sort",
"id=\"report-sort-" + key + "\" data-id=\"" + key + "\" aria-label=\"Nach " + esc(label) + " sortieren\"", current ? (descending ? -1 : 1) : 0);
}
body += "</div>";
for (size_t i = 0; i < rows.size(); ++i) {
const auto &row = rows[i];
body += "<div class=\"report-row " + std::string(i % 2 == 0 ? "striped" : "") +
"\" role=\"row\" data-club=\"" + esc(row.at("club").get<std::string>()) +
"\"><div class=\"report-cell first\" role=\"cell\">"
"<span class=\"report-rank\"><span>" +
std::to_string(row.at("rank").get<int>()) + ".</span></span>" +
report_club_button(row.at("club").get<std::string>()) +
"</div><div class=\"report-cell\" role=\"cell\">"
"<span class=\"report-value\">" + std::to_string(row.at("points").get<int>()) +
"</span></div></div>";
body += "</div><div id=\"report-list\" class=\"pg-tbody\">";
for (const auto &row : rows) {
const auto club = row.at("club").get<std::string>();
body += "<div class=\"pg-tr " + std::string(club == own_id ? "me" : "") + "\" role=\"row\" data-club=\"" + esc(club) + "\">" +
pg_td("<span class=\"pg-rank\">" + std::to_string(row.at("rank").get<int>()) + "</span>" + pg_club(club, 58), 0, "", true) +
pg_td("<span class=\"pg-num\">" + std::to_string(row.at("points").get<int>()) + "</span>", 120, "r") + "</div>";
}
if (rows.empty()) body += "<p class=\"indoor-empty\">Noch kein Hallenturnier gewertet.</p>";
if (rows.empty()) body += "<div class=\"pg-empty\">Noch kein Hallenturnier gewertet.</div>";
const auto footer = engine_mode_ ? engine_indoor_value_.at("footer").get<std::string>() : "Nach dem 5. Turnier";
body += "</div></div><nav class=\"report-footer\">" +
btn("indoor-info", "<span>" + esc(footer.empty() ? "Turnierinformationen" : footer) + "</span>", "report-reset indoor-info",
"id=\"indoor-info\"") + "</nav></div>";
body += "</div></div></div></div><nav class=\"pg-foot\">" +
pg_button("indoor-info", "<span>" + esc(footer.empty() ? "Turnierinformationen" : footer) + "</span>", "", "id=\"indoor-info\"") +
"<span class=\"pg-sp\"></span>" + pg_status("Gesamtwertung der Hallenturniere") + "</nav></div>";
return body + render_report_detail();
}
+3 -2
View File
@@ -144,7 +144,7 @@ std::string App::notebook_shell(const std::function<bool(const std::string &)> &
// the skin's inks (the light skin carries the design's terracotta and sage)
const std::string stitch = light ? "#f6a06b" : theme_ == "matchday" ? "#c9584f" : "#7fa3bd", rule = light ? "#e1eecc" : "#ffffff", margin = light ? "#ffc6a5" : theme_ == "matchday" ? "#c9584f" : "#7fa3bd",
ring = light ? "#8c491a" : "#ffffff", ribbon_a = light ? "#b2622d" : stitch, ribbon_b = light ? "#d67f48" : stitch;
std::string out = "<div class=\"nb-table\" style=\"height:" + scalar(stage) + "dp;\">" + picture(wood, 3840, stage, true) + "<div class=\"nb-table-light\" style=\"height:" + scalar(stage) + "dp;\"></div></div><div class=\"nb-book" + std::string(menu_.empty() ? "" : " legacy") + "\" id=\"notebook\" style=\"top:" + scalar(top) + "dp;\">";
std::string out = "<div class=\"nb-table\" style=\"height:" + scalar(stage) + "dp;\">" + picture(wood, 3840, stage, true) + "<div class=\"nb-table-light\" style=\"height:" + scalar(stage) + "dp;\"></div></div><div class=\"nb-book" + std::string(menu_.empty() || page_native() ? "" : " legacy") + "\" id=\"notebook\" style=\"top:" + scalar(top) + "dp;\">";
// the leather cover with its seam, the ribbon, the stack of sheets
out += "<div class=\"nb-cover-shadow\"></div><div class=\"nb-cover\">" + picture(leather, 3281, 2070, true) + "<div class=\"nb-cover-tone\"></div><div class=\"nb-seam\">" +
svg("nb-seam", 1440, 902, "<rect x=\"3\" y=\"3\" width=\"1434\" height=\"896\" rx=\"26\" fill=\"none\" stroke=\"" + stitch + "\" stroke-opacity=\".6\" stroke-width=\"2\" stroke-dasharray=\"9 7\"/>", 2400) + "</div></div>";
@@ -223,7 +223,8 @@ std::string App::notebook_shell(const std::function<bool(const std::string &)> &
svg("nb-corner", 62, 62, "<defs><linearGradient id=\"c\" x1=\"0\" y1=\"0\" x2=\"1\" y2=\"1\"><stop offset=\"0\" stop-color=\"" + std::string(light ? "#f9f4ed" : "#3a4654") + "\"/><stop offset=\".46\" stop-color=\"" +
std::string(light ? "#eee7db" : "#313c49") + "\"/><stop offset=\".5\" stop-color=\"" + std::string(light ? "#a19786" : "#10151b") + "\"/><stop offset=\".62\" stop-color=\"" + std::string(light ? "#dcd3c4" : "#27313c") +
"\"/><stop offset=\"1\" stop-color=\"" + std::string(light ? "#eee7db" : "#2c3743") + "\"/></linearGradient></defs><path d=\"M4 0H62V34A28 28 0 0 1 34 62H0V4A4 4 0 0 1 4 0Z\" fill=\"url(#c)\"/>", 200) + "</div></div>";
out += "<div class=\"nb-heading\"><small>" + esc(notebook_upper(kicker)) + "</small><strong>" + esc(heading) + "</strong></div><div class=\"nb-head\">" + head + "</div>";
page_title_ = heading; page_hint_.clear();
out += "<div class=\"nb-heading\"><small>" + esc(notebook_upper(kicker)) + "\x02H\x02</small><strong>\x02T\x02</strong></div><div class=\"nb-head\">" + head + "</div>";
// a paper clip at the top edge, a pencil in its loop at the right edge
out += "<div class=\"nb-clip\">" + svg("nb-clip", 30, 72, "<g fill=\"none\" stroke-linecap=\"round\"><rect x=\"4\" y=\"4\" width=\"22\" height=\"64\" rx=\"11\" stroke=\"#a19786\" stroke-width=\"3\"/><rect x=\"9\" y=\"18\" width=\"12\" height=\"42\" rx=\"6\" stroke=\"#c0b6a5\" stroke-width=\"3\"/></g>", 240) + "</div>";
out += "<div class=\"nb-pencil\">" + svg("nb-pencil", 16, 430,
+91
View File
@@ -0,0 +1,91 @@
// SPDX-License-Identifier: GPL-3.0-only
// The pages of the notebook: what all of them are built from. A page is 1244 x 720 design
// units (1 unit = 2.25 dp) under the heading of the sheet; its blocks are styled in pages.rcss.
// The menus that are laid out as a page of the notebook. Every other career menu is still a
// sheet of the old format, shown scaled inside the book.
bool App::page_native() const {
static const std::set<std::string> native{"tables", "league", "other", "strengths", "fairplay", "indoor", "scorers"};
return notebook_page() && native.contains(menu_);
}
// A length of the page design in dp.
std::string App::pg(double units) { return scalar(units * 2.25) + "dp"; }
// Inline styles written in design units: every "<number>px" becomes dp.
std::string App::pg_css(std::string_view css) {
std::string out;
for (size_t i = 0; i < css.size();) {
const bool starts = (std::isdigit(static_cast<unsigned char>(css[i])) || (css[i] == '.' && i + 1 < css.size() && std::isdigit(static_cast<unsigned char>(css[i + 1])))) &&
(i == 0 || !(std::isalnum(static_cast<unsigned char>(css[i - 1])) || css[i - 1] == '#' || css[i - 1] == '.'));
if (!starts) { out += css[i++]; continue; }
size_t end = i;
while (end < css.size() && (std::isdigit(static_cast<unsigned char>(css[end])) || css[end] == '.')) ++end;
if (css.substr(end, 2) == "px") { out += pg(std::stod(std::string(css.substr(i, end - i)))); i = end + 2; }
else { out.append(css.substr(i, end - i)); i = end; }
}
return out;
}
std::string App::pg_upper(const std::string &text) { return notebook_upper(text); }
std::string App::pg_kicker(const std::string &text, const std::string &css) {
return "<span class=\"pg-k\"" + (css.empty() ? std::string() : " style=\"" + pg_css(css) + "\"") + ">" + esc(pg_upper(text)) + "</span>";
}
std::string App::pg_stat(const std::string &label, const std::string &value, const std::string &sub) {
return "<div class=\"pg-stat\">" + pg_kicker(label) + "<strong>" + value + "</strong>" + (sub.empty() ? std::string() : "<small>" + sub + "</small>") + "</div>";
}
std::string App::pg_bar(double percent, const std::string &kind) {
return "<div class=\"pg-bar\"><div class=\"" + kind + "\" style=\"width:" + scalar(std::clamp(percent, 0.0, 100.0)) + "%;\"></div></div>";
}
std::string App::pg_dots(int on, int of) {
std::string out = "<span class=\"pg-dots\">";
for (int i = 0; i < of; ++i) out += i < on ? "<span class=\"on\"></span>" : "<span></span>";
return out + "</span>";
}
// The four lines of a team as the page writes them.
std::string App::pg_pos(const std::string &code) {
const std::string key = code == "TW" || code == "T" ? "TW" : code == "ABW" || code == "A" || code == "AB" ? "ABW" : code == "MIT" || code == "M" || code == "MF" ? "MIT" : code == "STU" || code == "S" || code == "ST" ? "STU" : "";
return "<span class=\"pg-pos " + key + "\">" + esc(key.empty() ? code : key) + "</span>";
}
// The last matches as marks: S won, U drawn, N lost, anything else not played.
std::string App::pg_form(const std::string &marks) {
std::string out = "<span class=\"pg-form\" title=\"" + esc(marks) + "\">";
for (const char c : marks) out += c == 'S' || c == 'U' || c == 'N' ? std::string("<span class=\"") + c + "\">" + c + "</span>" : std::string("<span class=\"X\"></span>");
return out + "</span>";
}
std::string App::pg_status(const std::string &text) { return text.empty() ? std::string() : "<span class=\"pg-status\">" + esc(text) + "</span>"; }
std::string App::pg_button(const std::string &action, const std::string &label, const std::string &css, const std::string &attrs) {
return btn(action, label, "pg-btn " + css, attrs);
}
// A cell of a table head (a button when the column sorts) and of a row; a width of 0 takes
// the room that is left. `align` is "", "r" or "c".
std::string App::pg_th(const std::string &label, double width, const std::string &align, const std::string &sort_action, const std::string &attrs, int sorted) {
const std::string css = "pg-th " + align + (width > 0 ? "" : " flex"), style = width > 0 ? " style=\"width:" + pg(width) + ";\"" : "";
const std::string text = "<span>" + esc(pg_upper(label)) + "</span>" + (sorted ? std::string("<span class=\"pg-sort ") + (sorted > 0 ? "up" : "down") + "\"></span>" : std::string());
if (sort_action.empty()) return "<span class=\"" + css + "\"" + style + ">" + text + "</span>";
return btn(sort_action, "<span class=\"pg-th-text\">" + text + "</span>", css, attrs + style);
}
std::string App::pg_td(const std::string &html, double width, const std::string &align, bool cell) {
return "<div class=\"pg-td " + align + (cell ? " cell" : "") + (width > 0 ? "" : " flex") + "\"" + (width > 0 ? " style=\"width:" + pg(width) + ";\"" : "") + ">" + html + "</div>";
}
// A dialog: a note on the dimmed book. `actions` are its buttons, right-aligned.
std::string App::pg_dialog(const std::string &title, const std::string &sub, const std::string &body, const std::string &actions, double width, const std::string &attrs) {
return "<div class=\"pg-ov\" " + attrs + "><div class=\"pg-dlg\" role=\"dialog\" aria-modal=\"true\" style=\"width:" + pg(width) + ";\">" +
(title.empty() ? std::string() : "<div><h2>" + esc(title) + "</h2>" + (sub.empty() ? std::string() : "<span class=\"pg-dlg-sub\">" + sub + "</span>") + "</div>") + body +
(actions.empty() ? std::string() : "<div class=\"pg-dlg-act\">" + actions + "</div>") + "</div></div>";
}
// A club as a link to its card: crest and name (the name first when `reverse`).
std::string App::pg_club(const std::string &id, double size, bool reverse) {
const auto *c = world_->find("clubs", id);
const auto live = engine_mode_ ? engine_report_team(id) : Json();
if ((engine_mode_ && live.is_null()) || (!engine_mode_ && !c)) return "<span>—</span>";
const auto name = esc(engine_mode_ ? live.at("name").get<std::string>() : world_->name(*c));
return btn("club-detail", crest(c, size) + "<span title=\"" + name + "\">" + name + "</span>", std::string("pg-link") + (reverse ? " reverse" : ""),
"id=\"report-club-" + esc(id) + "\" data-id=\"" + esc(id) + "\"");
}
// The heading of the sheet is written by the book before the page is; the page may have
// changed its title or added a hint since.
void App::notebook_finish(std::string &markup) {
for (const auto &[token, value] : {std::pair<std::string, std::string>{"\x02T\x02", esc(page_title_)}, {"\x02H\x02", page_hint_.empty() ? std::string() : " · " + esc(pg_upper(page_hint_))}})
for (size_t at = markup.find(token); at != std::string::npos; at = markup.find(token, at)) markup.replace(at, token.size(), value);
}
+48 -31
View File
@@ -69,45 +69,52 @@ std::string App::render_scorers() {
: (league ? league->value("nation", "") : "");
const auto rows = engine_mode_?engine_rankings_value_.at("categories").at(size_t(kind)):demo_scorer_rows(*world_, league_id, club, scope, kind);
const auto key = "scorers:" + league_id + ":" + std::to_string(scope) + ":" + std::to_string(kind);
const auto player_button = [&](const Json &r, bool leader) {
const auto photo = [&](const Json &r, double size) {
return "<span class=\"pg-photo\" style=\"width:" + scalar(size) + "dp;height:" + scalar(size) + "dp;border-radius:" + scalar(size / 2) + "dp;\">" +
img(r.at("photo").get<std::string>(), size, size, true, true, 256) + "</span>";
};
const auto player_button = [&](const Json &r, double size) {
const auto id = r.at("player").get<std::string>();
const double size = leader ? 126 : 88;
const auto image = "<span class=\"rankings-photo\" style=\"width:" + scalar(size) +
"dp;height:" + scalar(size) + "dp;\">" + img(r.at("photo").get<std::string>(), size, size, true, true, 256) + "</span>";
return btn("player-detail", image + "<span class=\"rankings-player-name\">" + esc(r.at("name").get<std::string>()) + "</span>",
"rankings-player-button", "id=\"rankings-player-" + esc(id) + "\" data-id=\"" + esc(id) +
const auto image = size > 100 ? std::string() :"<span class=\"pg-photo\" style=\"width:" + scalar(size) + "dp;height:" + scalar(size) + "dp;border-radius:" + scalar(size / 2) + "dp;\">" +
img(r.at("photo").get<std::string>(), size, size, true, true, 256) + "</span>";
return btn("player-detail", image + "<span class=\"pg-name\">" + esc(r.at("name").get<std::string>()) + "</span>",
"pg-link " + std::string(size > 100 ? "large" : "plain"), "id=\"rankings-player-" + esc(id) + "\" data-id=\"" + esc(id) +
"\" data-club=\"" + esc(r.at("club").get<std::string>()) + "\" title=\"" + esc(r.at("name").get<std::string>()) + "\"");
};
const auto club_button = [&](const Json &r, bool leader) {
const auto club_button = [&](const Json &r, double size) {
const auto id = r.at("club").get<std::string>();
return btn("club-detail", engine_mode_?"<span class=\"club-label\">"+crest(world_->find("clubs",id),leader?34:42)+"<span>"+esc(r.at("club_name").get<std::string>())+"</span></span>":label(world_->find("clubs", id), leader ? 34 : 42), "rankings-club-button " + std::string(id == club ? "current" : ""),
const auto name = engine_mode_ ? r.at("club_name").get<std::string>() : (world_->find("clubs", id) ? world_->name(*world_->find("clubs", id)) : std::string("—"));
return btn("club-detail", crest(world_->find("clubs", id), size) + "<span>" + esc(name) + "</span>", "pg-link plain",
"id=\"rankings-club-" + esc(r.at("player").get<std::string>()) + "\" data-id=\"" + esc(id) + "\"");
};
std::string out = "<section class=\"rankings-scorers kind-" + std::to_string(kind) + "\"><header class=\"rankings-heading\"><div><h2>" + esc(title) +
"</h2><span>" + esc(world_->nation_name(nation)) + " · Saison " + esc(engine_mode_?engine_rankings_value_.at("season").get<std::string>():rankings_season(snapshot.state, *world_)) +
"</span></div>"+(engine_mode_?"":"<p>Spielwerte fiktiv</p>")+"</header><nav class=\"rankings-tabs\" role=\"tablist\" aria-label=\"Spielerstatistik auswählen\">";
for (int i = 0; i < 4; ++i) {
const auto icon = i < 2 ? picture(renderer_.diagram("rankings-icon-" + std::to_string(i) + "-" + theme_, rankings_icon(i, theme_ == "silver" ? "#233443" : theme_ == "matchday" ? "#efeded" : "#b9cddd"), 102), 34, 34)
: "<span class=\"rankings-card-icon " + std::string(i == 2 ? "yellow" : "red") + "\"></span>";
out += btn("rankings-tab", "<span class=\"rankings-tab-icon\">" + icon + "</span><span>" + rankings_categories[size_t(i)] + "</span><span class=\"rankings-tab-underline\"></span>", "rankings-tab",
const std::string category = rankings_categories[size_t(kind)];
std::string out = "<section class=\"pg-page kind-" + std::to_string(kind) + "\"><div class=\"pg-row\" style=\"align-items:flex-end;\"><div class=\"pg-grow\"><h2 class=\"pg-h large\">" + esc(title) +
"</h2><span class=\"pg-mut\" style=\"display:block;\">" + esc(world_->nation_name(nation)) + " · Saison " + esc(engine_mode_?engine_rankings_value_.at("season").get<std::string>():rankings_season(snapshot.state, *world_)) +
(engine_mode_ ? "" : " · Spielwerte fiktiv") + "</span></div><nav class=\"pg-tabs\" role=\"tablist\" aria-label=\"Spielerstatistik auswählen\">";
for (int i = 0; i < 4; ++i)
out += btn("rankings-tab", "<span>" + std::string(rankings_categories[size_t(i)]) + "</span>", std::string(kind == i ? "on" : ""),
"id=\"player-stat-tab-" + std::to_string(i) + "\" data-kind=\"" + std::to_string(i) + "\" role=\"tab\" aria-selected=\"" +
std::string(kind == i ? "true" : "false") + "\" aria-controls=\"rankings-panel\" style=\"tab-index:" + (kind == i ? "auto" : "none") + ";\"");
}
out += "</nav><div id=\"rankings-panel\" class=\"rankings-panel\" role=\"tabpanel\" aria-labelledby=\"player-stat-tab-" + std::to_string(kind) + "\"><div class=\"rankings-leaders\" aria-label=\"Spitzenreiter\">";
out += "</nav></div><div id=\"rankings-panel\" class=\"pg-body\" role=\"tabpanel\" aria-labelledby=\"player-stat-tab-" + std::to_string(kind) + "\"><div class=\"pg-col\" style=\"" + pg_css("width:560px;gap:10px;") + "\" aria-label=\"Spitzenreiter\">" + pg_kicker("Spitzenreiter");
for (size_t i = 0; i < std::min(size_t(3), rows.size()); ++i) {
const auto &r = rows[i];
out += "<article class=\"rankings-leader " + std::string(i == 0 ? "first" : "") + "\" data-rank=\"" + r.at("rank").dump() + "\" data-value=\"" + r.at("value").dump() + "\"><span class=\"rankings-leader-rank\">" + r.at("rank").dump() + ".</span><div class=\"rankings-leader-person\">" + player_button(r, true) + club_button(r, true) + "</div><div class=\"rankings-leader-value\"><strong>" + r.at("value").dump() + "</strong><span>" + rankings_categories[size_t(kind)] + "</span></div></article>";
out += "<article class=\"pg-panel pg-row pg-lead " + std::string(i == 0 ? "first" : "") + "\" style=\"" + pg_css(i == 0 ? "gap:16px;padding:16px 20px;" : "gap:16px;padding:12px 20px;") +
"\" data-rank=\"" + r.at("rank").dump() + "\" data-value=\"" + r.at("value").dump() + "\"><span class=\"pg-big pg-lead-place\">" + r.at("rank").dump() + ".</span>" + photo(r, i == 0 ? 162 : 135) + "<div class=\"pg-grow pg-lead-person\">" +
player_button(r, 200) + club_button(r, 40) + "</div><strong class=\"pg-big pg-lead-figure\">" + r.at("value").dump() + "</strong></article>";
}
out += "</div><div id=\"rankings-list\" class=\"rankings-scorer-list\" data-scroll-key=\"" + esc(key) + "\"><div class=\"rankings-table\" role=\"table\"><div class=\"rankings-row rankings-head\" role=\"row\"><div>" + rankings_cell_text("Spieler") + "</div><div>" + rankings_cell_text("Verein") + "</div><div>" + rankings_cell_text(rankings_categories[size_t(kind)]) + "</div></div>";
out += "</div><div class=\"pg-panel pg-col pg-grow\" style=\"" + pg_css("gap:0px;padding:4px 12px;") + "\"><div class=\"pg-t\" role=\"table\"><div class=\"pg-thead\" role=\"row\">" +
pg_th("Spieler", 0) + pg_th("Verein", 250) + pg_th(category, 110, "r") + "</div><div id=\"rankings-list\" class=\"pg-tbody\" data-scroll-key=\"" + esc(key) + "\">";
for (size_t i = 3; i < rows.size(); ++i) {
const auto &r = rows[i];
out += "<div class=\"rankings-row " + std::string(i % 2 ? "striped" : "") + "\" role=\"row\" data-rank=\"" + r.at("rank").dump() + "\" data-value=\"" + r.at("value").dump() + "\"><div class=\"rankings-rest-player\"><span class=\"rankings-rank\">" + r.at("rank").dump() + ".</span>" + player_button(r, false) + "</div><div>" + club_button(r, false) + "</div><div>" + rankings_cell_text(r.at("value").dump()) + "</div></div>";
out += "<div class=\"pg-tr " + std::string(r.at("club").get<std::string>() == club ? "me" : "") + "\" role=\"row\" data-rank=\"" + r.at("rank").dump() + "\" data-value=\"" + r.at("value").dump() + "\">" +
pg_td("<span class=\"pg-rank pg-mut\" style=\"font-weight:normal;\">" + r.at("rank").dump() + ".</span>" + player_button(r, 54), 0, "", true) + pg_td(club_button(r, 44), 250, "", true) +
pg_td("<strong>" + r.at("value").dump() + "</strong>", 110, "r") + "</div>";
}
if (rows.empty()) out += "<div class=\"rankings-row\" role=\"row\"><div>"+rankings_cell_text("Keine Einträge in dieser Kategorie.")+"</div><div></div><div></div></div>";
out += "</div></div></div><nav class=\"report-footer rankings-footer\">";
if (!scope) out += report_picker("country", 0, 854.666667) + report_picker("league", 878.666667, 854.666667);
else out += "<span class=\"rankings-own-club\">" + label(own, 42) + "</span>";
out += report_picker("scorer-scope", scope ? 1749.333333 : 1757.333333, scope ? 862.666667 : 854.666667);
if (rows.empty()) out += "<div class=\"pg-empty\">Keine Einträge in dieser Kategorie.</div>";
out += "</div></div></div></div><nav class=\"pg-foot\">";
if (!scope) out += report_picker("country", -1, 0) + report_picker("league", -1, 0);
else out += "<span class=\"pg-row\">" + label(own, 50) + "</span>";
out += report_picker("scorer-scope", -1, 0) + "<span class=\"pg-sp\"></span>" + pg_status(std::to_string(rows.size()) + (rows.size() == 1 ? " Spieler" : " Spieler") + " · " + category);
rankings_view_["restore_scroll"] = true;
return out + "</nav></section>" + render_report_detail();
}
@@ -115,12 +122,22 @@ std::string App::render_scorers() {
std::string App::render_fairplay() {
rankings_remember_scroll();
const auto rows = engine_mode_?engine_fairplay_value_.at("rows"):demo_fairplay_rows(*world_);
std::string out = "<section class=\"rankings-fairplay\"><header class=\"rankings-fair-heading\"><p>Strafpunkte · weniger ist besser</p><div><span class=\"rankings-yellow\">Gelb · 1 Punkt</span><span class=\"rankings-red\">Rot · 4 Punkte</span></div></header><div id=\"rankings-list\" class=\"rankings-fair-list\" data-scroll-key=\"fairplay\"><div class=\"rankings-table\" role=\"table\"><div class=\"rankings-fair-row rankings-head\" role=\"row\"><div>" + rankings_cell_text("Pl. / Verein") + "</div><div>" + rankings_cell_text("Gelb") + "</div><div>" + rankings_cell_text("Rot") + "</div><div>" + rankings_cell_text("Punkte") + "</div></div>";
for (size_t i = 0; i < rows.size(); ++i) {
const auto &r = rows[i];
out += "<div class=\"rankings-fair-row " + std::string(i % 2 == 0 ? "striped" : "") + "\" role=\"row\" data-points=\"" + r.at("points").dump() + "\"><div><span class=\"rankings-fair-rank\">" + r.at("rank").dump() + ".</span>" + report_club_button(r.at("club").get<std::string>()) + "</div><div>" + rankings_cell_text(r.at("yellow").dump()) + "</div><div>" + rankings_cell_text(r.at("red").dump()) + "</div><div>" + rankings_cell_text(r.at("points").dump()) + "</div></div>";
const auto own_id = engine_mode_ ? engine_data_.at("desktop").at("meta").at("scope").at("teamId").get<std::string>()
: snap().state.at("career").value("role", "club") == "club" ? manager(snap()).value("club", "") : std::string();
int most = 1;
for (const auto &r : rows) most = std::max(most, r.at("points").get<int>());
std::string out = "<section class=\"pg-page\"><header class=\"pg-row\"><h2 class=\"pg-h pg-grow\" style=\"font-size:" + pg(22) + ";\">Strafpunkte · weniger ist besser</h2>"
"<span class=\"pg-legend\"><span class=\"pg-legend-item\"><span class=\"pg-legend-mark pg-card-mark yellow\"></span><span>Gelb · 1 Punkt</span></span><span class=\"pg-legend-item\"><span class=\"pg-legend-mark pg-card-mark red\"></span><span>Rot · 4 Punkte</span></span></span></header>"
"<div class=\"pg-panel pg-col pg-grow\" style=\"" + pg_css("gap:0px;padding:4px 12px;") + "\"><div class=\"pg-t\" role=\"table\"><div class=\"pg-thead\" role=\"row\">" +
pg_th("Pl. / Verein", 0) + pg_th("", 360) + pg_th("Gelb", 80, "r") + pg_th("Rot", 80, "r") + pg_th("Punkte", 90, "r") + "</div><div id=\"rankings-list\" class=\"pg-tbody\" data-scroll-key=\"fairplay\">";
const double row_height = rows.size() > 19 ? 1340.0 / rows.size() : 70;
for (const auto &r : rows) {
const auto club = r.at("club").get<std::string>();
out += "<div class=\"pg-tr " + std::string(club == own_id ? "me" : "") + "\" role=\"row\" data-points=\"" + r.at("points").dump() + "\" style=\"height:" + scalar(row_height) + "dp;\">" +
pg_td("<span class=\"pg-rank\">" + r.at("rank").dump() + "</span>" + pg_club(club), 0, "", true) + pg_td(pg_bar(r.at("points").get<int>() * 100.0 / most, "soft"), 360, "", true) +
pg_td(r.at("yellow").dump(), 80, "r") + pg_td(r.at("red").dump(), 80, "r") + pg_td("<span class=\"pg-num\">" + r.at("points").dump() + "</span>", 90, "r") + "</div>";
}
if (rows.empty()) out += "<p class=\"rankings-empty\">" + rankings_cell_text("Keine Vereine in der deutschen Ligavorschau.") + "</p>";
if (rows.empty()) out += "<div class=\"pg-empty\">Keine Vereine in dieser Wertung.</div>";
rankings_view_["restore_scroll"] = true;
return out + "</div></div></section>" + render_report_detail();
return out + "</div></div></div></section>" + render_report_detail();
}
+6 -3
View File
@@ -134,10 +134,13 @@ std::string App::report_picker(const std::string &kind, double left,
: kind == "stat-category" ? "Wettbewerbsgruppe"
: kind == "winner-country" ? "Land"
: kind == "stat-country" ? "Statistikbereich" : "Wettbewerb";
// on a notebook page (left < 0) the picker is an item of the page's foot with its name in front
const bool flow = left < 0;
std::string out =
"<div class=\"report-picker-wrapper\" data-report-picker=\"" + kind +
"\" style=\"left:" + scalar(left) + "dp;width:" + scalar(width) + "dp;\">" +
btn("report-picker", "<span class=\"report-picker-label\">" + esc(caption) +
"<div class=\"report-picker-wrapper" + std::string(flow ? " pg-dd" : "") + "\" data-report-picker=\"" + kind +
"\"" + (flow ? std::string() : " style=\"left:" + scalar(left) + "dp;width:" + scalar(width) + "dp;\"") + ">" +
btn("report-picker", (flow ? "<span class=\"pg-dd-l\">" + esc(pg_upper(kind == "year" ? "Jahr" : menu_label)) + "</span>" : std::string()) +
"<span class=\"report-picker-label\">" + esc(flow && kind == "year" ? std::to_string(almanac_year_) : caption) +
"</span><span class=\"report-picker-arrow\" aria-hidden=\"true\">"
"<span></span></span>",
"report-picker-trigger",
+89 -142
View File
@@ -56,21 +56,14 @@ std::string App::render_reports(const std::string &mode) {
{"points", "Punkte"}, {"gf", "Tore"}, {"diff", "Diff."}};
const bool real_other=engine_mode_&&mode=="other";
const auto &fixture=real_other?engine_other_value_:engine_fixtures_value_;
std::vector<double> widths;
if (matches)
widths = real_other?std::vector<double>{1184,240,1184}:std::vector<double>{1224,160,1224}; // Match card has two 2dp borders.
else if (strengths) {
widths.push_back(2612 * .38);
for (int i = 0; i < 5; ++i) widths.push_back(2612 * .62 / 5);
} else {
for (int i = 0; i < 9; ++i)
widths.push_back(i == 0 ? 2612 * .32 : i == 5 ? 2612 * .14 : 2612 * .54 / 7);
}
const double heading_height = matches ? 80 : strengths ? (rows.size() >= 20 ? 64 : 66)
: rows.size() >= 20 ? 64 : 80;
const double row_height = matches ? 118 : strengths ? (rows.size() >= 20 ? 64 : 66)
: rows.size() >= 16 ? (1682 - heading_height) / rows.size() : 80;
std::string body = "<div id=\"report-underlay\" class=\"report-underlay\">";
const auto own_id = engine_mode_ ? engine_data_.at("desktop").at("meta").at("scope").at("teamId").get<std::string>()
: snap().state.at("career").value("role", "club") == "club" ? manager(snap()).value("club", "") : std::string();
// a place the season decides tints its row: Europe, promotion, relegation
const auto zone_of = [&](const Json &row) -> std::string {
const auto zone = engine_mode_ ? row.value("zone", std::string()) : report_zone(row.value("rank", 0), int(rows.size()), tier);
return zone == "europe" || zone == "champions" || zone == "europa" || zone == "conference" ? "eu" : zone == "promotion" || zone == "playoff" ? "auf" : zone == "relegation" ? "ab" : "";
};
std::string body = "<div id=\"report-underlay\" class=\"pg-page\">";
if (matches) {
const int round = engine_mode_?fixture.at("round").get<int>()-1:std::clamp(state.value("round", 0), 0,
report_round_count(*world_, state, mode == "other") - 1);
@@ -84,142 +77,96 @@ std::string App::render_reports(const std::string &mode) {
const auto choices = report_picker_items("competition");
subtitle = choices.at(size_t(state.value("competition", 0))).second;
}
body += "<header class=\"report-match-heading\"><h2>" +
const double mid = real_other ? 190 : 120;
body += "<header class=\"pg-heading\"><h2 class=\"pg-h large\">" +
(real_other?fixture.at("heading").get<std::string>():opening ? std::string("1. Runde") : std::to_string(round + 1) + ". Spieltag") +
"</h2><p>" + esc(subtitle) + "</p></header>";
}
body += "<div id=\"report-list\" class=\"report-list " +
std::string(matches ? "match-list" : strengths ? "strength-list" : "standings-list") +
"\"><div class=\"report-table\" role=\"table\"><div class=\"report-row report-head\" "
"role=\"row\" style=\"height:" + scalar(heading_height) + "dp;\">";
for (size_t column = 0; column < headings.size(); ++column) {
const auto &[key, label] = headings[column];
const auto sorting = matches ? Json::object() : state.at("sorts").at(mode);
const bool current = !matches && sorting.value("key", "") == key;
const bool descending = sorting.value("desc", false);
body += "<div class=\"report-cell " + std::string(column == 0 ? "first" : "") +
(matches && column == 1 ? " score" : "") + "\" role=\"columnheader\" "
"aria-sort=\"" + (current ? descending ? "descending" : "ascending" : "none") +
"\" style=\"width:" + scalar(widths[column]) + "dp;\">";
if (matches)
body += "<span class=\"report-value\">" + esc(label) + "</span>";
else {
std::string indicator = "<span class=\"report-sort-symbol\">";
if (!current || !descending)
indicator += "<span class=\"report-sort-arrow up\"></span>";
if (!current || descending)
indicator += "<span class=\"report-sort-arrow down\"></span>";
indicator += "</span>";
body += btn("report-sort", "<span>" + esc(label) + "</span>" + indicator,
"report-sort", "id=\"report-sort-" + key + "\" data-id=\"" + key +
"\" aria-label=\"Nach " + esc(label) + " sortieren\"");
"</h2><span class=\"pg-mut\">" + esc(subtitle) + "</span></header><div class=\"pg-panel pg-col pg-grow\" style=\"" + pg_css("gap:0px;padding:10px 14px;") + "\">"
"<div class=\"pg-match-head\">" + pg_kicker("Heim", "text-align:right;") + "<span class=\"pg-k pg-c\" style=\"flex:none;width:" + pg(mid) + ";\">ERGEBNIS</span>" + pg_kicker("Auswärts") + "</div>"
"<div id=\"report-list\" class=\"pg-tbody " + std::string(rows.size() <= 12 ? "even" : "") + "\">";
for (const auto &row : rows) {
const auto home = row.at("home").get<std::string>(), away = row.at("away").get<std::string>();
std::string value = row.at("home_goals").is_null() || row.at("away_goals").is_null()
? std::string() : report_number(row["home_goals"]) + " : " + report_number(row["away_goals"]);
std::string middle, detail;
if (real_other) {
const auto phase = [](const Json &v) { return v == 1 ? std::string(" n.V.") : v == 2 ? std::string(" n.E.") : std::string(); };
if (!value.empty()) value += phase(row.at("phase"));
if (row.at("secondLegVisible").get<bool>()) {
detail = "Hin: " + (row.at("secondLeg").is_null() ? std::string("–") : report_number(row.at("secondLeg")[0]) + ":" + report_number(row.at("secondLeg")[1]) + phase(row.at("secondLegPhase")));
if (!value.empty()) value = "Rück: " + value;
} else if (row.at("status") == "scheduled" && row.at("date").is_string()) detail = row.at("date").get<std::string>();
}
const bool moved = engine_mode_ && (row.value("status", "") == "rescheduled" || row.value("status", "") == "postponed");
if (!value.empty()) middle = "<span class=\"pg-score\">" + esc(value) + "</span>" + (detail.empty() ? "" : "<small>" + esc(detail) + "</small>");
else if (moved) middle = "<span class=\"pg-tag accent\" style=\"display:inline-block;\">verlegt</span>";
else if (!detail.empty()) middle = "<span class=\"pg-tag\" style=\"display:inline-block;\">" + esc(detail) + "</span>";
else middle = "<span class=\"pg-mut\">–</span>";
body += "<div class=\"pg-match " + std::string(!own_id.empty() && (home == own_id || away == own_id) ? "me" : "") + "\" role=\"row\"><div class=\"pg-match-side home\">" + pg_club(home, 50, true) +
"</div><div class=\"pg-match-mid\" style=\"width:" + pg(mid) + ";\">" + middle + "</div><div class=\"pg-match-side\">" + pg_club(away) + "</div></div>";
}
body += "</div>";
}
body += "</div>";
for (size_t i = 0; i < rows.size(); ++i) {
const auto &row = rows[i];
// the manager's own club stands out: a bar in its colour down the left edge
const std::string row_club = row.value("club", "");
const bool own_row = !matches && !row_club.empty() &&
(engine_mode_ ? engine_data_.at("desktop").at("meta").at("scope").at("teamId") == row_club
: snap().state.at("career").value("role", "club") == "club" && manager(snap()).value("club", "") == row_club);
std::string own_colour;
if (own_row)
if (const auto *club = world_->find("clubs", row_club); club && !club->value("crest", "").empty()) own_colour = renderer_.crest_colour(club->value("crest", ""));
// a place the season decides tints its whole row
const std::string row_zone = matches || strengths ? std::string()
: engine_mode_ ? row.value("zone", std::string()) : report_zone(row.value("rank", 0), int(rows.size()), tier);
body += "<div class=\"report-row " + std::string(i % 2 == 0 ? "striped" : "") + (own_row ? " own" : "") + (row_zone.empty() ? "" : " zone-" + row_zone) +
"\" role=\"row\" data-club=\"" + esc(row.value("club", "")) +
"\" style=\"height:" + scalar(row_height) + "dp;" + (own_colour.empty() ? "" : "border-left-color:" + own_colour + ";") + "\">";
if (real_other && rows.empty())
body += "<div class=\"pg-empty\">" + std::string(!fixture.at("available").get<bool>() ? "Diese Runde ist noch nicht ausgelost oder die vorherige Phase ist noch nicht abgeschlossen." : "Keine Paarungen vorhanden.") + "</div>";
body += "</div></div>";
} else {
// the widths of the columns in design units; the first takes the room that is left
const std::vector<double> widths = strengths ? std::vector<double>{0, 150, 150, 150, 150, 110} : std::vector<double>{0, 52, 52, 52, 52, 190, 80, 80, 70};
const auto sorting = state.at("sorts").at(mode);
const double row_height = rows.size() > 20 ? 1420.0 / rows.size() : 70;
body += "<div class=\"pg-panel pg-col pg-grow\" style=\"" + pg_css("gap:0px;padding:4px 12px;") + "\"><div class=\"pg-t\" role=\"table\"><div class=\"pg-thead\" role=\"row\">";
for (size_t column = 0; column < headings.size(); ++column) {
body += "<div class=\"report-cell " + std::string(column == 0 ? "first" : "") +
(matches && column == 1 ? " score" : "") +
(!matches && !strengths && column == 5 ? " form" : "") +
"\" role=\"cell\" style=\"width:" + scalar(widths[column]) + "dp;\">";
if (matches && column != 1)
body += report_club_button(row.at(column == 0 ? "home" : "away").get<std::string>(), column == 0);
else if (!matches && column == 0) {
if (!strengths) {
const auto zone = engine_mode_?row.value("zone", std::string()):report_zone(row.value("rank", 0), int(rows.size()), tier);
body += "<span class=\"report-zone " + zone + "\"></span><span class=\"report-rank\"><span>" +
std::to_string(row.value("rank", 0)) + ".</span></span>";
}
body += report_club_button(row.at("club").get<std::string>());
} else {
std::string value;
if (matches)
value = row.at("home_goals").is_null() || row.at("away_goals").is_null()
? (engine_mode_&&(row.value("status","")=="rescheduled"||row.value("status","")=="postponed")?"verlegt":"–") : report_number(row["home_goals"]) + " : " + report_number(row["away_goals"]);
else if (!strengths && column == 5)
value = row.value("form_text", "");
else if (!strengths && column == 7)
value = report_number(row["gf"]) + ":" + report_number(row["ga"]);
else
value = report_number(row.at(headings[column].first));
if(real_other&&matches) {
const auto phase=[](const Json &v){return v==1?std::string(" n.V."):v==2?std::string(" n.E."):std::string();};
value+=phase(row.at("phase"));
std::string detail;
if(row.at("secondLegVisible").get<bool>()) {
detail="Hin: "+(row.at("secondLeg").is_null()?std::string("–"):report_number(row.at("secondLeg")[0])+":"+report_number(row.at("secondLeg")[1])+phase(row.at("secondLegPhase")));
value="Rück: "+value;
} else if(row.at("status")=="scheduled"&&row.at("date").is_string())detail=row.at("date").get<std::string>();
body+="<div class=\"report-score-lines\"><span class=\"report-value\">"+esc(value)+"</span>"+(detail.empty()?"":"<span class=\"report-score-note\">"+esc(detail)+"</span>")+"</div>";
} else if (!matches && !strengths && column == 5) {
// the last matches as marks: won, drawn, lost, not played
body += "<span class=\"report-form\" title=\"" + esc(value) + "\">";
for (const char c : value)
body += std::string("<span class=\"form-mark ") + (c == 'S' ? "won" : c == 'U' ? "drawn" : c == 'N' ? "lost" : "none") + "\"></span>";
body += "</span>";
} else body += "<span class=\"report-value\">" + esc(value) + "</span>";
const auto &[key, label] = headings[column];
const bool current = sorting.value("key", "") == key, descending = sorting.value("desc", false);
body += pg_th(label, widths[column], column == 0 ? "" : !strengths && column == 5 ? "" : "r", "report-sort",
"id=\"report-sort-" + key + "\" data-id=\"" + key + "\" aria-label=\"Nach " + esc(label) + " sortieren\"", current ? (descending ? -1 : 1) : 0);
}
body += "</div><div id=\"report-list\" class=\"pg-tbody\">";
for (const auto &row : rows) {
const auto club = row.value("club", std::string());
const auto zone = strengths ? std::string() : zone_of(row);
body += "<div class=\"pg-tr " + std::string(!club.empty() && club == own_id ? "me " : "") + (zone.empty() ? "" : "z-" + zone) + "\" role=\"row\" data-club=\"" + esc(club) +
"\" style=\"height:" + scalar(row_height) + "dp;\">";
for (size_t column = 0; column < headings.size(); ++column) {
const auto &key = headings[column].first;
if (column == 0)
body += pg_td((strengths ? std::string() : "<span class=\"pg-zone " + zone + "\"></span><span class=\"pg-rank\">" + std::to_string(row.value("rank", 0)) + "</span>") + pg_club(club), 0, "", true);
else if (strengths && column < 5) {
const auto value = row.at(key).is_number_integer() ? row.at(key).get<int>() : 0;
body += pg_td("<span style=\"display:block;width:" + pg(70) + ";\">" + pg_bar((value - 50) / 40.0 * 100) + "</span><strong style=\"display:block;width:" + pg(26) + ";text-align:right;\">" + report_number(row.at(key)) + "</strong>", widths[column], "r", true);
} else if (strengths)
body += pg_td("<span class=\"pg-num\">" + report_number(row.at(key)) + "</span>", widths[column], "r");
else if (column == 5)
body += pg_td(pg_form(row.value("form_text", "")), widths[column], "", true);
else if (column == 6)
body += pg_td("<span class=\"pg-num\">" + report_number(row.at(key)) + "</span>", widths[column], "r");
else if (column == 7)
body += pg_td(report_number(row["gf"]) + ":" + report_number(row["ga"]), widths[column], "r");
else if (column == 8) {
const auto diff = row.at(key).is_number_integer() ? row.at(key).get<int64_t>() : 0;
body += pg_td((diff > 0 ? "+" : "") + report_number(row.at(key)), widths[column], "r");
} else
body += pg_td(report_number(row.at(key)), widths[column], "r");
}
body += "</div>";
}
body += "</div>";
body += "</div></div></div>";
}
body += "</div>";
if(real_other&&rows.empty())body+="<p class=\"report-detail-empty\">"+std::string(!fixture.at("available").get<bool>()?"Diese Runde ist noch nicht ausgelost oder die vorherige Phase ist noch nicht abgeschlossen.":"Keine Paarungen vorhanden.")+"</p>";
body+="</div>";
if (!matches && !strengths && engine_mode_) {
// only the zones this league has
std::string items;
for (const auto &[kind, label] : std::array<std::pair<const char *, const char *>, 3>{{{"europe", "Europapokal"}, {"promotion", "Aufstieg"}, {"relegation", "Abstieg"}}})
if (std::any_of(rows.begin(), rows.end(), [&](const Json &row) { return row.value("zone", "") == kind; }))
items += "<span class=\"report-legend-item\"><span class=\"report-zone " + std::string(kind) + "\"></span><span>" + label + "</span></span>";
if (!items.empty()) body += "<div class=\"report-legend\">" + items + "</div>";
}
if (!matches && !strengths && !engine_mode_) {
const auto legend = tier == 1
? std::vector<std::pair<std::string, std::string>>{
{"champions", "Champions League"}, {"europa", "Europa League"},
{"conference", "Conference League"}, {"relegation", "Abstieg"}}
: tier == 4 ? std::vector<std::pair<std::string, std::string>>{
{"promotion", "Aufstieg"}, {"relegation", "Abstieg"}}
: std::vector<std::pair<std::string, std::string>>{
{"promotion", "Aufstieg"}, {"playoff", "Relegation"}, {"relegation", "Abstieg"}};
body += "<div class=\"report-legend\">";
for (const auto &[kind, label] : legend)
body += "<span class=\"report-legend-item\"><span class=\"report-zone " + kind +
"\"></span><span>" + esc(label) + "</span></span>";
body += "</div>";
}
body += "<nav class=\"report-footer\">";
// the foot: steps and pickers at the left, a legend or a note at the right
body += "<nav class=\"pg-foot\">";
if (matches) {
for (int i = 0; i < 2; ++i)
body += btn("report-round", i ? "›" : "‹", "report-round",
"id=\"report-round-" + std::string(i ? "next" : "previous") +
"\" data-id=\"" + (i ? "1" : "-1") + "\" style=\"" +
rect(i * 130, 0, 110, 94) + "\" " + ((opening||(engine_mode_&&(i?fixture.at("round")==fixture.at("rounds"):fixture.at("round")==1))) ? "disabled" : ""));
body += mode == "league" ? report_picker("country", 260, 1060) + report_picker("league", 1340, 1272)
: report_picker("competition", 260, 2352);
body += pg_button("report-round", i ? "›" : "‹", "round",
"id=\"report-round-" + std::string(i ? "next" : "previous") + "\" data-id=\"" + (i ? "1" : "-1") + "\" aria-label=\"" + (i ? "Nächste Runde" : "Vorige Runde") + "\" " +
((opening||(engine_mode_&&(i?fixture.at("round")==fixture.at("rounds"):fixture.at("round")==1))) ? "disabled" : ""));
body += mode == "league" ? report_picker("country", -1, 0) + report_picker("league", -1, 0) : report_picker("competition", -1, 0);
} else if (strengths)
body += report_picker("country", 0, 1294) + report_picker("league", 1318, 1294);
else
body += btn("report-reset", "Gesamt", "report-reset", "id=\"report-reset\" style=\"" +
rect(0, 0, 635, 94) + "\"") +
report_picker("filter", 659, 635) + report_picker("country", 1318, 635) +
report_picker("league", 1977, 635);
body += report_picker("country", -1, 0) + report_picker("league", -1, 0) + "<span class=\"pg-sp\"></span>" +
pg_status((league ? world_->name(*league) + " · " : std::string()) + std::to_string(rows.size()) + " Vereine · Spaltenkopf anklicken zum Sortieren");
else {
body += pg_button("report-reset", "Gesamt", "", "id=\"report-reset\"") + report_picker("filter", -1, 0) + report_picker("country", -1, 0) + report_picker("league", -1, 0) + "<span class=\"pg-sp\"></span><span class=\"pg-legend\">";
for (const auto &[kind, label] : std::array<std::pair<const char *, const char *>, 3>{{{"eu", "Europapokal"}, {"auf", "Aufstieg"}, {"ab", "Abstieg"}}})
if (std::any_of(rows.begin(), rows.end(), [&](const Json &row) { return zone_of(row) == kind; }))
body += "<span class=\"pg-legend-item\"><span class=\"pg-legend-mark pg-zone " + std::string(kind) + "\"></span><span>" + label + "</span></span>";
body += "</span>";
}
return body + "</nav></div>" + render_report_detail();
}
+23 -1
View File
@@ -685,7 +685,7 @@ class App final : public Rml::EventListener {
// on a page of the notebook the sheet has no frame of its own and lies where the book lies
const bool page = notebook_page();
if (page) club_mark.clear();
return (page ? "<div class=\"nb-sheet-layer\" style=\"top:" + scalar(notebook_top()) + "dp;\"><div class=\"window nb-sheet" + arriving + "\"><div class=\"titlebar\">"
return (page ? "<div class=\"nb-sheet-layer\" style=\"top:" + scalar(notebook_top()) + "dp;\"><div class=\"window nb-sheet" + std::string(page_native() ? " pg-root" : "") + arriving + "\"><div class=\"titlebar\">"
: "<div class=\"sheet-under first" + arriving + "\"></div><div class=\"sheet-under second" + arriving + "\"></div><div class=\"window" + arriving + "\"><div class=\"titlebar\"" + club_rule + ">") +
(close ? btn("close", "<span>×</span>", "close", "id=\"window-close\" aria-label=\"" + std::string(menu_ == "bank" && bank_view_ != "entrance" ? "Zurück zur Bankhalle" : "Fenster schließen") + "\"")
: "<span style=\"width:76dp;\"></span>") +
@@ -874,6 +874,26 @@ class App final : public Rml::EventListener {
std::string notebook_home(const Json &model);
Json notebook_news();
static Json notebook_lamps(Json lamps);
// the building blocks of a notebook page (pages.inc)
bool page_native() const;
static std::string pg(double units);
static std::string pg_css(std::string_view css);
static std::string pg_upper(const std::string &text);
static std::string pg_kicker(const std::string &text, const std::string &css = {});
static std::string pg_stat(const std::string &label, const std::string &value, const std::string &sub = {});
static std::string pg_bar(double percent, const std::string &kind = {});
static std::string pg_dots(int on, int of);
static std::string pg_pos(const std::string &code);
static std::string pg_form(const std::string &marks);
static std::string pg_status(const std::string &text);
static std::string pg_button(const std::string &action, const std::string &label, const std::string &css = {}, const std::string &attrs = {});
static std::string pg_th(const std::string &label, double width, const std::string &align = {}, const std::string &sort_action = {}, const std::string &attrs = {}, int sorted = 0);
static std::string pg_td(const std::string &html, double width, const std::string &align = {}, bool cell = false);
static std::string pg_dialog(const std::string &title, const std::string &sub, const std::string &body, const std::string &actions, double width, const std::string &attrs = {});
std::string pg_club(const std::string &id, double size = 50, bool reverse = false);
void notebook_finish(std::string &markup);
// what the page says in the heading of the sheet instead of its plain name, and after it
std::string page_title_, page_hint_;
// a career menu is a page of the notebook, not a window of its own
bool notebook_page() const { return (scene_ == "desktop" || scene_ == "engine") && !menu_.empty(); }
bool calendar_month_action(const std::string &, Rml::Element *);
@@ -1171,6 +1191,7 @@ class App final : public Rml::EventListener {
if (!menu_.empty())
markup += render_menu(menu_);
setting_menu_markup_ = true;
notebook_finish(markup);
element("canvas")->SetInnerRML(markup);
++document_generation_;
sync_window_zoom();
@@ -1752,6 +1773,7 @@ public:
#include "modern/ui/calendar_year.inc"
#include "modern/ui/notebook.inc"
#include "modern/ui/notebook_home.inc"
#include "modern/ui/pages.inc"
#include "modern/ui/finance_simulation.inc"
#include "modern/ui/statistics_analysis.inc"
#include "modern/ui/engine_rankings.inc"