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

+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"