The sheet of the interested clubs no longer repeats the chosen club

Its crest, name and league stand in the list already; the colour key moves
to the foot of the sheet.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
MichaelandClaude Fable 5.2 committed 2026-11-17 13:51:07 +01:00
1 parent 112b8492d9
commit ce8b871202
2 files changed
+6 -8

No files matched your search

+3 -3
View File
@@ -1101,8 +1101,8 @@ body .popup-box p.as-verdict {margin:14dp 0 0;text-align:center;font-size:31dp;}
.cs-title {display:block;flex:1;min-width:0;}
.cs-title h3 {display:block;margin:0;font-family:Display;font-weight:normal;font-size:76dp;line-height:88dp;}
.cs-title span {display:block;font-size:34dp;line-height:44dp;color:var(--p-n7);}
.cs-key {display:block;flex:none;font-size:27dp;line-height:40dp;}
.cs-key span {display:block;padding-left:18dp;border-left:22dp var(--p-n5);margin:8dp 0;}
.cs-key {display:flex;gap:44dp;margin-right:auto;font-size:29dp;line-height:40dp;}
.cs-key span {display:block;padding-left:18dp;border-left:22dp var(--p-n5);}
.cs-key span.new {border-left-color:var(--p-a5);}
.cs-row {display:flex;gap:24dp;flex:none;}
.cs-box {display:block;box-sizing:border-box;padding:24dp 28dp;border:2dp var(--p-div);border-radius:28dp;background-color:var(--p-n1);}
@@ -1146,4 +1146,4 @@ body .popup-box p.as-verdict {margin:14dp 0 0;text-align:center;font-size:31dp;}
.cs-none.small {padding:50dp 0;}
.cs-sum.cs-age {width:230dp;}
.cs-cash .cs-label {overflow:hidden;white-space:nowrap;text-overflow:ellipsis;}
.pg-dlg.cs-sheet {height:1900dp;}
.pg-dlg.cs-sheet {height:1680dp;}
+3 -5
View File
@@ -152,11 +152,7 @@ std::string App::engine_assembly_sheet() {
out += "</div><div class=\"cs-detail\">";
if (chosen) {
const Json &c = *chosen;
const auto *club = world_->find("clubs", c.value("teamId", std::string()));
const std::string name = name_of(c), mine = name_of(own);
out += "<div class=\"cs-top\"><span class=\"cs-big\">" + (club ? crest(club, 230) : std::string()) + "</span><div class=\"cs-title\"><h3>" + esc(name) + "</h3><span>" + esc(c.value("league", std::string())) + " · " +
esc(place_of(c)) + (c.contains("leagueSize") ? " von " + std::to_string(c.value("leagueSize", 0)) : std::string()) + "</span></div><div class=\"cs-key\"><span class=\"own\">" + esc(mine) +
"</span><span class=\"new\">" + esc(name) + "</span></div></div>";
// the team, part by part
const Json a = own.value("lines", Json::object()), b = c.value("lines", Json::object());
out += "<div class=\"cs-row\"><section class=\"cs-box cs-team\"><span class=\"pg-k\">MANNSCHAFT IM VERGLEICH</span><div class=\"cs-chart\">" + assembly_pair("Tor", a.value("goal", 0), b.value("goal", 0)) +
@@ -215,7 +211,9 @@ std::string App::engine_assembly_sheet() {
"<div class=\"cs-row\">" + ages + form + "</div>" +
"<p class=\"cs-note\">Beim Wechsel bleiben dein Konto, deine Aktien, Fonds und Kredite zurück. Stadion, Verträge und Werbung beginnen beim neuen Verein neu.</p>";
}
out += "</div></div><nav class=\"pg-dlg-act\">" + pg_button("assembly-close", forced ? "Zum Schreibtisch" : "Abbrechen", "", "id=\"assembly-close\"") +
// which colour is which club, beside the buttons
const std::string key = chosen ? "<div class=\"cs-key\"><span class=\"own\">" + esc(name_of(own)) + "</span><span class=\"new\">" + esc(name_of(*chosen)) + "</span></div>" : std::string();
out += "</div></div><nav class=\"pg-dlg-act\">" + key + pg_button("assembly-close", forced ? "Zum Schreibtisch" : "Abbrechen", "", "id=\"assembly-close\"") +
pg_button("assembly-take", chosen ? name_of(*chosen) + " übernehmen" : std::string("Übernehmen"), "primary", "id=\"assembly-take\" " + std::string(chosen ? "" : "disabled=\"disabled\"")) + "</nav></section></div>";
return out;
}