diff --git a/assets/modern/bank.rcss b/assets/modern/bank.rcss
index 6f8f0ed..98add30 100644
--- a/assets/modern/bank.rcss
+++ b/assets/modern/bank.rcss
@@ -82,3 +82,7 @@ body.matchday .credit-fact>strong,body.matchday .bank-overview-row>strong {color
body.matchday #bank-term {background-color:#191a208a;color:#efeded;}
body.matchday .credit-schedule {background-color:#1d1e2466;}
body.matchday .bank-actions .bank-control {decorator:linear-gradient(180deg,#e8d6dc12,#a1a0aa0d);}
+/* each service of the hall carries its name on a paper tag */
+.bank-hotspot {display:flex;align-items:flex-end;justify-content:center;}
+.bank-tag {display:block;flex-shrink:0;margin-bottom:10dp;padding:6dp 22dp;border:2dp #7b725f88;border-radius:6dp;background-color:#fbfaf6f0;color:#233443;font-family:Display;font-size:34dp;line-height:44dp;white-space:nowrap;}
+.bank-hotspot:hover .bank-tag {background-color:#ffffff;border-color:#25617a;}
diff --git a/assets/modern/theme.rcss b/assets/modern/theme.rcss
index 8c24237..afb35f2 100644
--- a/assets/modern/theme.rcss
+++ b/assets/modern/theme.rcss
@@ -187,11 +187,12 @@ body.silver .titlebar {border-bottom-color:#4a433438;}
body.calm .window.window-in,body.calm .sheet-under.window-in {animation:none;}
button {transition:background-color border-color 0.12s cubic-out;}
/* the desk: cards and tiles lie above the stadium and answer the pointer */
-.desktop-card {box-shadow:0dp 10dp 30dp #00000055;}
-.desktop-card[data-action] {transition:transform box-shadow 0.14s cubic-out;}
-.desktop-card[data-action]:hover {transform:translateY(-4dp);box-shadow:0dp 16dp 40dp #00000070;}
+/* no shadow under the glass cards: with the backdrop blur it draws stray lines */
+.desktop-card[data-action] {transition:transform 0.14s cubic-out;}
+.desktop-card[data-action]:hover {transform:translateY(-4dp);}
.desktop-app .app-tile {transition:transform 0.12s cubic-out;box-shadow:0dp 8dp 20dp #00000060;}
.desktop-app:hover .app-tile {transform:translateY(-6dp) scale(1.04);}
.desktop-app:active .app-tile {transform:scale(0.97);}
body.calm .desktop-app:hover .app-tile,body.calm .desktop-card[data-action]:hover {transform:none;}
.identity strong {font-family:Display;font-size:44dp;}
+.titlebar-club {margin-left:auto;width:68dp;height:68dp;flex-shrink:0;}
diff --git a/src/modern/ui/bank_screens.inc b/src/modern/ui/bank_screens.inc
index 17fdcd3..1b4661f 100644
--- a/src/modern/ui/bank_screens.inc
+++ b/src/modern/ui/bank_screens.inc
@@ -19,19 +19,28 @@ std::string App::render_bank() {
btn("bank-calc", left, "bank-control", "id=\"bank-" + std::string(lk) + "\" data-kind=\"" + lk + "\"") +
btn("bank-calc", right, "bank-control", "id=\"bank-" + std::string(rk) + "\" data-kind=\"" + rk + "\"") + "";
};
+ // A data set may carry the newer hall picture or only the first one; each has its own
+ // places for the five services.
+ const bool newer_hall = !renderer_.image("art.bank-hall-v2.png", false, 3000).token.empty();
std::string out = "
" +
- img("art.bank-hall-v2.png", 2608, 1466.016746, false, false, 3000);
+ img(newer_hall ? "art.bank-hall-v2.png" : "art.bank-hall-v1.png", 2608, 1466.016746, false, false, 3000);
if (bank_view_ == "entrance") {
struct Service { const char *id, *label, *hint; double x, y, w, h; };
- const std::array
services{{
+ const std::array services = newer_hall ? std::array{{
{"properties", "Immobilien", "Immobilien – Gebäude ansehen, kaufen oder verkaufen.", 14, 23, 23, 43},
{"stocks", "Aktien", "Aktien – Kurse und Bestände ansehen, Aktien kaufen oder verkaufen.", 49, 4, 45, 26},
{"overview", "Finanzübersicht", "Finanzübersicht – Konto, Sparbuch, Immobilien, Aktien und Kredit im Überblick.", 44, 48, 14, 17},
{"savings", "Sparbuch", "Sparbuch – Guthaben ansehen, Geld einzahlen oder abheben.", 78, 55, 12, 11},
- {"credit", "Kredit", "Kredit – Laufzeit wählen, einen Kredit aufnehmen oder tilgen.", 81, 32, 15, 22}}};
+ {"credit", "Kredit", "Kredit – Laufzeit wählen, einen Kredit aufnehmen oder tilgen.", 81, 32, 15, 22}}}
+ : std::array{{
+ {"properties", "Immobilien", "Immobilien – Gebäude ansehen, kaufen oder verkaufen.", .5, 18.5, 17.5, 43.5},
+ {"stocks", "Aktien", "Aktien – Kurse und Bestände ansehen, Aktien kaufen oder verkaufen.", 30, 30, 13.5, 19.5},
+ {"overview", "Finanzübersicht", "Finanzübersicht – Konto, Sparbuch, Immobilien, Aktien und Kredit im Überblick.", 30.5, 49.5, 13, 14.5},
+ {"savings", "Sparbuch", "Sparbuch – Guthaben ansehen, Geld einzahlen oder abheben.", 85, 60, 6.5, 7.5},
+ {"credit", "Kredit", "Kredit – Laufzeit wählen, einen Kredit aufnehmen oder tilgen.", 85.3, 31.5, 13.7, 27.5}}};
out += "";
for (const auto &s : services)
- out += btn("bank-view", "", "bank-hotspot", "id=\"bank-view-" + std::string(s.id) +
+ out += btn("bank-view", std::string("") + s.label + "", "bank-hotspot", "id=\"bank-view-" + std::string(s.id) +
"\" data-view=\"" + s.id + "\" data-bank-hint=\"" + esc(s.hint) + "\" aria-label=\"" + s.label +
"\" style=\"left:" + scalar(s.x) + "%;top:" + scalar(s.y) + "%;width:" + scalar(s.w) + "%;height:" + scalar(s.h) + "%;\"");
out += "
";
diff --git a/src/modern/ui/engine_live.cpp b/src/modern/ui/engine_live.cpp
index be8b337..bd2473e 100644
--- a/src/modern/ui/engine_live.cpp
+++ b/src/modern/ui/engine_live.cpp
@@ -311,6 +311,8 @@ Json engine_live_progress(const Json &previous, const Json &state, const Json &b
if (next.is_object() && next.at("home").at("id") == m.at("home").at("id")) {
competition = next.at("competition").value("text", competition);
std::replace(competition.begin(), competition.end(), '\n', ' ');
+ // the original's column label for a postponed league match, spelled out
+ if (competition == "Verlegte Sp.") competition = "Nachholspiel";
// "24.Spieltag" of the original reads "24. Spieltag"
for (size_t i = 0; i + 1 < competition.size(); ++i)
if (competition[i] == '.' && std::isalpha(static_cast(competition[i + 1]))) competition.insert(++i, 1, ' ');
diff --git a/src/modern/ui/settings_screens.inc b/src/modern/ui/settings_screens.inc
index eb6ef11..e56ed76 100644
--- a/src/modern/ui/settings_screens.inc
+++ b/src/modern/ui/settings_screens.inc
@@ -219,10 +219,10 @@ std::string App::render_settings() {
pane =
"Gestaltung
";
const std::array
, 3> themes{
- {{{"midnight", "Mitternacht",
- "Dunkles Blau, mintgrüne Akzente"}},
- {{"silver", "Papier",
+ {{{"silver", "Papier",
"Helles Papier, blaue Akzente"}},
+ {{"midnight", "Mitternacht",
+ "Dunkles Blau, mintgrüne Akzente"}},
{{"matchday", "Spieltag", "Graphit, rote Akzente"}}}};
for (const auto &t : themes) {
const std::string type = t[0];
diff --git a/src/modern/ui/ui_preferences.cpp b/src/modern/ui/ui_preferences.cpp
index 62ac7e3..b23d698 100644
--- a/src/modern/ui/ui_preferences.cpp
+++ b/src/modern/ui/ui_preferences.cpp
@@ -21,7 +21,7 @@ bool choice(const Json &v, std::initializer_list names) {
}
} // namespace
Json default_ui_preferences() {
- return {{"theme", "midnight"},
+ return {{"theme", "silver"},
{"display",
{{"mode", "window"},
{"resolution", "1920x1080"},
diff --git a/src/modern/ui/view.cpp b/src/modern/ui/view.cpp
index 634c350..4445ba5 100644
--- a/src/modern/ui/view.cpp
+++ b/src/modern/ui/view.cpp
@@ -416,7 +416,7 @@ class App final : public Rml::EventListener {
// A menu window (2720 x 2040 at the middle of the stage) is shown as large as the screen
// allows; the desk behind it is cropped. Without a window the whole stage is fitted.
bool window_zoom_ = false;
- std::string scene_ = "main", menu_, theme_ = "midnight", active_mod_,
+ std::string scene_ = "main", menu_, theme_ = "silver", active_mod_,
selected_mod_, notice_, country_ = "nation:de", league_,
selected_club_;
std::vector mods_;
@@ -617,10 +617,23 @@ class App final : public Rml::EventListener {
// a sheet of paper on two more; it slides in once when its menu opens, not on every redraw
const std::string arriving = window_shown_ == menu_ ? "" : " window-in";
window_shown_ = menu_;
- return "" +
+ // the head of every sheet carries the manager's club: its crest at the right, its colour
+ // as the rule under the title
+ std::string club_rule, club_mark;
+ try {
+ std::string own;
+ if (engine_mode_) own = engine_data_.at("desktop").at("meta").at("scope").at("teamId").get
();
+ else if (world_ && source_ && snap().state.at("career").value("role", "club") == "club") own = manager(snap()).value("club", "");
+ if (const auto *club = world_ && !own.empty() ? world_->find("clubs", own) : nullptr; club && !club->value("crest", "").empty()) {
+ if (const auto colour = renderer_.crest_colour(club->value("crest", "")); !colour.empty()) club_rule = " style=\"border-bottom:6dp " + colour + ";\"";
+ club_mark = "" + crest(club, 68) + "
";
+ }
+ } catch (const std::exception &) {
+ }
+ return "" +
(close ? btn("close", "×", "close", "id=\"window-close\" aria-label=\"" + std::string(menu_ == "bank" && bank_view_ != "entrance" ? "Zurück zur Bankhalle" : "Fenster schließen") + "\"")
: "") +
- "
" + esc(heading) + "
" +
+ "
" + esc(heading) + "
" + club_mark + "" +
content + "
" + (amount_ ? render_amount() : "") + "
";
}
std::string