From ee2968d1a3655ff9fda4a39d2159d833bbbb5cf4 Mon Sep 17 00:00:00 2001 From: Weyoune Date: Sun, 15 Nov 2026 19:29:38 +0100 Subject: [PATCH] The transfer market's offers as large cards; nothing lies half over the cup ring An offer card shows photograph or initials, position, country, age and seller, the four values as figures and the fee; three rows of them fill the page. The deal's buttons sit under the squad's strength, clear of the lower right corner. What is switched off on a page is pale, not translucent, and the ring a cup left on the paper is drawn only where the page keeps its corner free or covers it with a panel. Co-Authored-By: Claude Fable 5.2 --- assets/modern/pages.rcss | 27 +++++++++++++++++++++++++++ src/modern/ui/notebook.inc | 7 +++++-- src/modern/ui/transfer_screens.inc | 26 ++++++++++++++++++++------ 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/assets/modern/pages.rcss b/assets/modern/pages.rcss index 44015e9..fc5f35d 100644 --- a/assets/modern/pages.rcss +++ b/assets/modern/pages.rcss @@ -401,3 +401,30 @@ body .popup-box input {height:84dp;padding:0 26dp;border:2dp var(--p-div);border .pg-root .tm-card,.pg-root .tm-card:hover {height:190dp;} .tm-card .pg-row .tm-attr strong {display:inline;font-weight:bold;} .tm-card-text strong {font-weight:bold;} + +/* nothing on a page lets the paper's marks shine through: what is switched off is pale, not translucent */ +.pg-root .pg-btn:disabled,.pg-ov .pg-btn:disabled {opacity:1;background-color:var(--p-n2);border-color:var(--p-div);color:var(--p-n5);} +body .pg-btn.pg-go:disabled {opacity:1;background-color:var(--p-a3);border-color:var(--p-a3);color:var(--p-n1);} +.pg-seg button:disabled {opacity:1;color:var(--p-n5);} +.pg-tabs button:disabled {opacity:1;color:var(--p-n5);} +.pg-card:disabled {opacity:1;color:var(--p-n5);} +.pg-root .cal-step:disabled,.pg-root .cal-back:disabled {opacity:1;color:var(--p-n5);} + +/* the transfer market's offers: three rows of large cards */ +.pg-root .tm-card,.pg-root .tm-card:hover {height:386dp;padding:27dp 30dp;gap:0dp;justify-content:space-between;} +.tm-card-text strong {font-size:36dp;line-height:44dp;} +.tm-seller {display:block;font-size:26dp;line-height:34dp;color:var(--p-n7);} +.tm-initials {display:block;flex:none;width:132dp;height:132dp;line-height:132dp;border-radius:66dp;background-color:var(--p-surf);font-family:Display;font-size:44dp;text-align:center;color:var(--p-a8);} +.tm-chips {gap:12dp;} +.tm-chip {display:block;flex:1;padding:8dp 0;border-radius:22dp;background-color:var(--p-n2);text-align:center;} +.tm-chip small {display:block;font-size:22dp;line-height:28dp;letter-spacing:1.5dp;font-weight:bold;color:var(--p-n7);} +.tm-chip strong {display:block;font-family:Display;font-weight:normal;font-size:40dp;line-height:46dp;} +.tm-chip.strong {background-color:var(--p-a2);} +.tm-chip.strong strong {color:var(--p-a9);} +.tm-card .pg-row .tm-fee {display:block;font-family:Display;font-weight:normal;font-size:40dp;line-height:46dp;} +.tm-card.sel .tm-chip {background-color:var(--p-n1);} +.tm-card.sel .tm-chip.strong {background-color:var(--p-a3);} +.pg-root .tm-card,.pg-root .tm-card:hover {height:338dp;padding:22dp 30dp;} +.pg-root .pg-btn[disabled],.pg-ov .pg-btn[disabled] {opacity:1;background-color:var(--p-n2);border-color:var(--p-div);color:var(--p-n5);} +body .pg-btn.pg-go[disabled] {opacity:1;background-color:var(--p-a3);border-color:var(--p-a3);color:var(--p-n1);} +.pg-seg button[disabled],.pg-tabs button[disabled] {opacity:1;color:var(--p-n5);} diff --git a/src/modern/ui/notebook.inc b/src/modern/ui/notebook.inc index cd08d08..9452dc8 100644 --- a/src/modern/ui/notebook.inc +++ b/src/modern/ui/notebook.inc @@ -216,10 +216,13 @@ std::string App::notebook_shell(const std::function & std::string lines; for (double y = 44; y < 850; y += 32) lines += ""; lines += ""; - lines += ""; + // the ring a cup left in the lower right corner: only where the page keeps that corner free or covers it + // with a panel of its own, never under bare writing or an older sheet + const bool stain = menu_.empty() || (page_native() && menu_ != "tactics"); + if (stain) lines += ""; out += "
" + picture(paper, 3163.5, 1948.5, true) + "
"; if (const auto art = notebook_art(); !art.token.empty()) out += "
" + picture(art, 3163.5, 1948.5, true) + "
"; - out += "
" + svg("nb-lines", 1406, 866, lines, 2800) + "
" + + out += "
" + svg(stain ? "nb-lines" : "nb-lines-plain", 1406, 866, lines, 2800) + "
" + svg("nb-corner", 62, 62, "", 200) + "
"; diff --git a/src/modern/ui/transfer_screens.inc b/src/modern/ui/transfer_screens.inc index 40dcb69..acb7d94 100644 --- a/src/modern/ui/transfer_screens.inc +++ b/src/modern/ui/transfer_screens.inc @@ -263,13 +263,27 @@ std::string App::render_transfer() { const auto id = r.at("id").get(); const bool mine = r.at("own"); const bool selected = (mine ? transfer_view_.at("own") : transfer_view_.at("market")) == id && side_now == (mine ? "own" : "market"); + // a card: who he is, his four values, what he costs and who sells + const auto name = r.at("name").get(); + std::string initials; + for (size_t at = 0; at < name.size() && initials.size() < 4; at = name.find(' ', at) == std::string::npos ? name.size() : name.find(' ', at) + 1) { + const unsigned char lead = static_cast(name[at]); + initials += name.substr(at, lead >= 0xC0 ? (lead >= 0xE0 ? 3 : 2) : 1); + if (name.find(' ', at) == std::string::npos) break; + } const auto photo = r.contains("photo") && r.at("photo").is_string() && !r.at("photo").get().empty() - ? "" + img(r.at("photo").get(), 104, 104, true, true, 256) + "" : std::string(); + ? "" + img(r.at("photo").get(), 132, 132, true, true, 256) + "" + : "" + esc(initials) + ""; + const auto *seller = world_->find("clubs", r.value("club", std::string())); + const auto seller_name = seller ? world_->name(*seller) : r.value("seller_name", std::string("—")); + std::string chips; + for (const auto &[label, key] : std::array, 4>{{{"Ko", "condition"}, {"Te", "technique"}, {"Fo", "form"}, {"Stärke", "strength"}}}) + chips += "
" + label + "" + transfer_ui_number(r.at(key)) + "
"; out += btn(mine ? "transfer-own" : "transfer-market", - "
" + photo + "
" + esc(r.at("name").get()) + "
" + - nation(r) + "" + transfer_ui_number(r.at("age")) + " J." + trait(r.at("foot"), true) + trait(r.at("type"), false) + "
" + pg_pos(transfer_ui_role(r.at("position"))) + - "
" + transfer_ui_number(r.at("condition")) + " · " + transfer_ui_number(r.at("technique")) + " · " + transfer_ui_number(r.at("form")) + " (" + - transfer_ui_number(r.at("strength")) + ")" + esc(r.at("fee").is_number_integer() ? transfer_money(r.at("fee").get()) : std::string("—")) + "
", + "
" + photo + "
" + esc(name) + "
" + + pg_pos(transfer_ui_role(r.at("position"))) + nation(r) + "" + transfer_ui_number(r.at("age")) + " Jahre" + (r.at("foot").is_number_integer() ? trait(r.at("foot"), true) : std::string()) + (r.at("type").is_number_integer() ? trait(r.at("type"), false) : std::string()) + "
" + esc(mine ? std::string("Dein Spieler · auf dem Markt") : seller_name) + + "
" + chips + "
" + + esc(pg_upper(mine ? "Marktwert" : "Ablöse")) + "" + esc(r.at("fee").is_number_integer() ? transfer_money(r.at("fee").get()) : std::string("—")) + "
", "pg-card tm-card " + std::string(mine ? "transfer-own-listing " : "") + (selected ? "sel" : ""), "id=\"transfer-market-" + esc(id) + "\" data-player=\"" + esc(id) + "\" data-preview=\"" + esc(id) + "\" aria-pressed=\"" + (((mine ? transfer_view_.at("own") : transfer_view_.at("market")) == id) ? "true" : "false") + "\""); } @@ -310,7 +324,7 @@ std::string App::render_transfer() { const bool pending = engine_mode_ && !mine && chosen.is_object() && chosen.value("bid", Json()).is_object(); const bool pending_loan = pending && chosen.at("bid").value("loan", false); const bool on_list = mine && listed(chosen.at("id")); - out += "
" + + out += "
" + pg_button("transfer-offer", on_list ? "Vom Markt nehmen" : mine ? "Verkaufen" : "Kaufen", "primary tm-deal", "id=\"transfer-offer-buy-sell\" data-kind=\"" + std::string(mine ? "sell" : "buy") + "\" " + std::string(chosen.is_object() && (!engine_mode_ || !mine || !on_list) && (!pending || !pending_loan) ? "" : "disabled")) + pg_button("transfer-offer", mine ? "Verleihen" : "Ausleihen", "tm-deal",