Render typed bilingual news and preserve historical journal scope (by Codex)
This commit is contained in:
1 parent
1eb5e99847
commit
950d79d529
16 files changed
+6858
-81
No files matched your search
@@ -2,9 +2,19 @@
|
||||
std::string App::render_news_art(const Json &message, double size) {
|
||||
const auto kind = message.at("kind").get<std::string>();
|
||||
std::string art;
|
||||
if (kind == "club")
|
||||
art = crest(club(snap()), size * .69);
|
||||
else {
|
||||
if (kind == "national" ||
|
||||
(message.contains("scope") &&
|
||||
message.at("scope").value("kind", "") == "national"))
|
||||
art = picture(
|
||||
renderer_.diagram("news-national-flag", ui_nation_flag_svg("de"), 176),
|
||||
size * .69, size * .46);
|
||||
else if (kind == "club" || kind == "career") {
|
||||
const auto id =
|
||||
message.value("scope", Json::object()).value("id", std::string());
|
||||
art = crest(snap().world->find("clubs", id), size * .69);
|
||||
if (art.empty())
|
||||
art = glyph("world", size * .55);
|
||||
} else {
|
||||
const auto key =
|
||||
kind == "fixture" ? "button.league"
|
||||
: kind == "transfer" ? "button.contracts"
|
||||
@@ -29,13 +39,17 @@ std::string App::render_news_feed(const Json &data) {
|
||||
(unread ? " is-unread" : "") + "\">";
|
||||
if (unread)
|
||||
out += "<span class=\"news-unread-dot\"></span>";
|
||||
out += render_news_art(m) +
|
||||
"<div class=\"news-message-copy\"><div "
|
||||
"class=\"news-message-meta\"><span>" +
|
||||
esc(m.at("display_date").get<std::string>()) +
|
||||
"</span><span class=\"news-category\">" +
|
||||
esc(m.at("category").get<std::string>()) + "</span>" +
|
||||
(unread ? "<span class=\"news-new\">Neu</span>" : "") + "</div>";
|
||||
out +=
|
||||
render_news_art(m) +
|
||||
"<div class=\"news-message-copy\"><div "
|
||||
"class=\"news-message-meta\"><span>" +
|
||||
esc(m.at("display_date").get<std::string>()) +
|
||||
"</span><span class=\"news-category\">" +
|
||||
esc(m.at("category").get<std::string>()) + "</span>" +
|
||||
(unread ? "<span class=\"news-new\">Neu</span>" : "") +
|
||||
(data.value("fictional", false) ? "<span class=\"news-new\">Demo</span>"
|
||||
: "") +
|
||||
"</div>";
|
||||
out += btn("news-open", esc(name), "news-message-title",
|
||||
"id=\"news-read-" + id + "\" data-id=\"" + id +
|
||||
"\" aria-label=\"Nachricht lesen: " + esc(name) + "\"");
|
||||
@@ -70,10 +84,10 @@ std::string App::render_news_feed(const Json &data) {
|
||||
: archive ? "Dein Archiv ist noch leer"
|
||||
: "Alles auf dem neuesten Stand") +
|
||||
"</h3><p>" +
|
||||
std::string(
|
||||
query ? "Versuche einen anderen Suchbegriff."
|
||||
: archive ? "Archivierte Meldungen bleiben hier zum Nachlesen."
|
||||
: "Hier erscheinen neue Meldungen aus deinem Verein.") +
|
||||
std::string(query ? "Versuche einen anderen Suchbegriff."
|
||||
: archive
|
||||
? "Archivierte Meldungen bleiben hier zum Nachlesen."
|
||||
: "Hier erscheinen neue Meldungen für dein Team.") +
|
||||
"</p></div>";
|
||||
}
|
||||
return out;
|
||||
@@ -107,9 +121,10 @@ std::string App::render_news() {
|
||||
news_world_ = s.world;
|
||||
news_source_ = source_.get();
|
||||
}
|
||||
const auto data =
|
||||
demo_news_view(*s.world, s.state, news_view_.value("folder", "inbox"),
|
||||
news_view_.value("query", ""));
|
||||
const auto data = demo_news_view(
|
||||
*s.world, s.state, news_view_.value("folder", "inbox"),
|
||||
news_view_.value("query", ""),
|
||||
ui_preferences_.at("display").value("language", std::string("de")));
|
||||
if (!data.value("ok", false))
|
||||
return window("Nachrichten",
|
||||
"<p>Das Nachrichtenpostfach ist nicht verfügbar.</p>");
|
||||
@@ -118,11 +133,18 @@ std::string App::render_news() {
|
||||
"<div id=\"news-underlay\" class=\"news-layout\"><div "
|
||||
"class=\"news-masthead\"><div class=\"news-brand\"><span "
|
||||
"class=\"news-wordmark\">kicker</span><div><p>DEIN "
|
||||
"VEREINSJOURNAL</p><h2>Nachrichten</h2></div></div><div "
|
||||
"SPIELJOURNAL</p><h2>Nachrichten</h2></div></div><div "
|
||||
"class=\"news-owner\"><div><strong>" +
|
||||
esc(data.at("club_name").get<std::string>()) + "</strong><p>" +
|
||||
esc(data.at("date").get<std::string>()) + "</p></div>" +
|
||||
crest(club(s), 88) + "</div></div>";
|
||||
(data.value("scope", Json::object()).value("kind", std::string()) ==
|
||||
"national"
|
||||
? picture(renderer_.diagram("news-header-national",
|
||||
ui_nation_flag_svg("de"), 176),
|
||||
88, 59)
|
||||
: crest(s.world->find("clubs", data.value("club", std::string())),
|
||||
88)) +
|
||||
"</div></div>";
|
||||
content += "<div class=\"news-navigation\"><div class=\"news-tabs\" "
|
||||
"role=\"tablist\" aria-label=\"Postfach und Archiv\">";
|
||||
for (const auto &f : {std::string("inbox"), std::string("archive")})
|
||||
@@ -160,19 +182,25 @@ std::string App::render_news() {
|
||||
" · " + std::to_string(data.at("shown_unread").get<int>()) +
|
||||
" ungelesen"
|
||||
: feedback);
|
||||
content +=
|
||||
"</p>" +
|
||||
btn("news-undo",
|
||||
glyph("undo", 32) + "<span>Rückgängig</span>",
|
||||
"news-undo",
|
||||
"id=\"news-undo\" style=\"display:" +
|
||||
std::string(news_undo_.is_array() && !news_undo_.empty()
|
||||
? "flex"
|
||||
: "none") +
|
||||
";\"") +
|
||||
"</div></div>";
|
||||
if (data.value("unbound_count", size_t(0)))
|
||||
content +=
|
||||
esc(" · " + std::to_string(data.at("unbound_count").get<size_t>()) +
|
||||
(data.at("unbound_count").get<size_t>() == 1
|
||||
? " Altbestand ohne Besitzerbeleg unverändert erhalten"
|
||||
: " Altbestände ohne Besitzerbeleg unverändert erhalten"));
|
||||
content += "</p>" +
|
||||
btn("news-undo", glyph("undo", 32) + "<span>Rückgängig</span>",
|
||||
"news-undo",
|
||||
"id=\"news-undo\" style=\"display:" +
|
||||
std::string(news_undo_.is_array() && !news_undo_.empty()
|
||||
? "flex"
|
||||
: "none") +
|
||||
";\"") +
|
||||
"</div></div>";
|
||||
if (!news_dialog_.empty()) {
|
||||
const auto all = demo_news_view(*s.world, s.state, folder, "");
|
||||
const auto all = demo_news_view(
|
||||
*s.world, s.state, folder, "",
|
||||
ui_preferences_.at("display").value("language", std::string("de")));
|
||||
const auto &items = all.at("items");
|
||||
const auto found =
|
||||
std::find_if(items.begin(), items.end(),
|
||||
@@ -188,14 +216,16 @@ std::string App::render_news() {
|
||||
"id=\"window-close\" aria-label=\"Fenster schließen\"") +
|
||||
"<h1>Nachrichten</h1></div><div class=\"content\">" + content +
|
||||
"</div><div class=\"news-screen-footer\"><span>Fiktive "
|
||||
"Vereinsmeldungen · Modern UI "
|
||||
"Meldungen · Modern UI "
|
||||
"Demo</span><span>OpenBMH</span></div><div "
|
||||
"class=\"news-homebar\"></div></div>";
|
||||
}
|
||||
|
||||
std::string App::render_news_widget(const Json &object) {
|
||||
const auto s = snap();
|
||||
const auto data = demo_news_view(*s.world, s.state, "inbox", "");
|
||||
const auto data = demo_news_view(
|
||||
*s.world, s.state, "inbox", "",
|
||||
ui_preferences_.at("display").value("language", std::string("de")));
|
||||
if (!data.value("ok", false))
|
||||
return "";
|
||||
const bool compact_preview =
|
||||
|
||||
Reference in new issue
Block a user