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 <noreply@anthropic.com>
This commit is contained in:
MichaelandClaude Fable 5.2 committed 2026-11-15 19:29:38 +01:00
1 parent aeef2ed653
commit ee2968d1a3
3 files changed
+52 -8

No files matched your search

+27
View File
@@ -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);}
+5 -2
View File
@@ -216,10 +216,13 @@ std::string App::notebook_shell(const std::function<bool(const std::string &)> &
std::string lines;
for (double y = 44; y < 850; y += 32) lines += "<path d=\"M10 " + scalar(y) + "H1396\" stroke=\"" + rule + "\" stroke-opacity=\"" + (light ? "1" : ".08") + "\" stroke-width=\"1.2\"/>";
lines += "<path d=\"M66 8V858\" stroke=\"" + margin + "\" stroke-opacity=\"" + (light ? "1" : ".4") + "\" stroke-width=\"2\"/>";
lines += "<g fill=\"none\" stroke=\"" + ring + "\"><path d=\"M1183 800A61 61 0 1 1 1257 786\" stroke-width=\"6\" stroke-opacity=\".13\" stroke-linecap=\"round\"/><path d=\"M1200 720A58 58 0 1 0 1290 716\" stroke-width=\"2\" stroke-opacity=\".1\"/></g>";
// 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 += "<g fill=\"none\" stroke=\"" + ring + "\"><path d=\"M1183 800A61 61 0 1 1 1257 786\" stroke-width=\"6\" stroke-opacity=\".13\" stroke-linecap=\"round\"/><path d=\"M1200 720A58 58 0 1 0 1290 716\" stroke-width=\"2\" stroke-opacity=\".1\"/></g>";
out += "<div class=\"nb-paper\">" + picture(paper, 3163.5, 1948.5, true) + "<div class=\"nb-paper-edge\"></div>";
if (const auto art = notebook_art(); !art.token.empty()) out += "<div class=\"nb-paper-art\">" + picture(art, 3163.5, 1948.5, true) + "</div>";
out += "<div class=\"nb-paper-lines\">" + svg("nb-lines", 1406, 866, lines, 2800) + "</div><div class=\"nb-corner\">" +
out += "<div class=\"nb-paper-lines\">" + svg(stain ? "nb-lines" : "nb-lines-plain", 1406, 866, lines, 2800) + "</div><div class=\"nb-corner\">" +
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>";
+20 -6
View File
@@ -263,13 +263,27 @@ std::string App::render_transfer() {
const auto id = r.at("id").get<std::string>();
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>();
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<unsigned char>(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<std::string>().empty()
? "<span class=\"pg-photo\" style=\"width:104dp;height:104dp;border-radius:52dp;\">" + img(r.at("photo").get<std::string>(), 104, 104, true, true, 256) + "</span>" : std::string();
? "<span class=\"pg-photo\" style=\"width:132dp;height:132dp;border-radius:66dp;\">" + img(r.at("photo").get<std::string>(), 132, 132, true, true, 256) + "</span>"
: "<span class=\"tm-initials\">" + esc(initials) + "</span>";
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<std::pair<const char *, const char *>, 4>{{{"Ko", "condition"}, {"Te", "technique"}, {"Fo", "form"}, {"Stärke", "strength"}}})
chips += "<div class=\"tm-chip" + std::string(std::string(key) == "strength" ? " strong" : "") + "\"><small>" + label + "</small><strong>" + transfer_ui_number(r.at(key)) + "</strong></div>";
out += btn(mine ? "transfer-own" : "transfer-market",
"<div class=\"pg-row\" style=\"" + pg_css("gap:10px;") + "\">" + photo + "<div class=\"tm-card-text\"><strong class=\"pg-nowrap\">" + esc(r.at("name").get<std::string>()) + "</strong><div class=\"pg-row pg-mut\" style=\"" + pg_css("gap:6px;font-size:12px;") + "\">" +
nation(r) + "<span>" + transfer_ui_number(r.at("age")) + " J.</span>" + trait(r.at("foot"), true) + trait(r.at("type"), false) + "</div></div>" + pg_pos(transfer_ui_role(r.at("position"))) +
"</div><div class=\"pg-row\" style=\"justify-content:space-between;font-size:" + pg(12.5) + ";\"><span class=\"tm-attr\">" + transfer_ui_number(r.at("condition")) + " · " + transfer_ui_number(r.at("technique")) + " · " + transfer_ui_number(r.at("form")) + " <strong>(" +
transfer_ui_number(r.at("strength")) + ")</strong></span><strong>" + esc(r.at("fee").is_number_integer() ? transfer_money(r.at("fee").get<int64_t>()) : std::string("—")) + "</strong></div>",
"<div class=\"pg-row\" style=\"" + pg_css("gap:10px;") + "\">" + photo + "<div class=\"tm-card-text\"><strong class=\"pg-nowrap\">" + esc(name) + "</strong><div class=\"pg-row pg-mut\" style=\"" + pg_css("gap:6px;font-size:12.5px;") + "\">" +
pg_pos(transfer_ui_role(r.at("position"))) + nation(r) + "<span>" + transfer_ui_number(r.at("age")) + " Jahre</span>" + (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()) + "</div><div class=\"tm-seller pg-nowrap\">" + esc(mine ? std::string("Dein Spieler · auf dem Markt") : seller_name) +
"</div></div></div><div class=\"pg-row tm-chips\">" + chips + "</div><div class=\"pg-row\" style=\"justify-content:space-between;\"><span class=\"pg-k\">" +
esc(pg_upper(mine ? "Marktwert" : "Ablöse")) + "</span><strong class=\"tm-fee\">" + esc(r.at("fee").is_number_integer() ? transfer_money(r.at("fee").get<int64_t>()) : std::string("—")) + "</strong></div>",
"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 += "</section><span class=\"pg-sp\"></span><div class=\"pg-col\" style=\"" + pg_css("gap:6px;") + "\">" +
out += "</section><div class=\"pg-col\" style=\"" + pg_css("gap:6px;") + "\">" +
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",