From 154c842dfa9ae553a7ad1e44b5df165d2c3389a5 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Wed, 29 May 2024 17:11:02 -0500 Subject: [PATCH 1/7] CLDR-17462 update ST status icons for clarity --- tools/cldr-apps/js/src/esm/cldrTable.mjs | 5 ++--- tools/cldr-apps/js/src/esm/cldrText.mjs | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/cldr-apps/js/src/esm/cldrTable.mjs b/tools/cldr-apps/js/src/esm/cldrTable.mjs index 5683f2621b1..f0e7dc3ebbf 100644 --- a/tools/cldr-apps/js/src/esm/cldrTable.mjs +++ b/tools/cldr-apps/js/src/esm/cldrTable.mjs @@ -676,14 +676,13 @@ function getStatusIcon(statusClass) { switch (statusClass) { case "approved": case "contributed": - return "✓"; // U+2713 case "missing": case "provisional": case "unconfirmed": - return "✘"; // U+2718 + return cldrText.get(`status_${statusClass}`); case "inherited-provisional": case "inherited-unconfirmed": - return "↑"; // U+2191 + return cldrText.get("inherited"); default: return "?"; // U+003F } diff --git a/tools/cldr-apps/js/src/esm/cldrText.mjs b/tools/cldr-apps/js/src/esm/cldrText.mjs index 9e8faa7f4e3..2b97e78f374 100644 --- a/tools/cldr-apps/js/src/esm/cldrText.mjs +++ b/tools/cldr-apps/js/src/esm/cldrText.mjs @@ -471,6 +471,14 @@ const strings = { report_notAcceptable: "Not Acceptable", report_missing: "Missing", + // for approval status, see VoteResolver.Status + status_approved: "✅", + status_contributed: "☑️", + status_provisional: "✖️", + status_unconfirmed: "❌", + status_missing: "❓️", + status_inherited: "↑", + special_about: "About Survey Tool", special_announcements: "Announcements", special_account: "Account Settings", From 4a10a6c9d7a9965f37a8b0b0465082858b52a8f0 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Wed, 29 May 2024 19:06:08 -0500 Subject: [PATCH 2/7] CLDR-17462 update ST status icons for clarity - update missing and inherited --- tools/cldr-apps/js/src/esm/cldrTable.mjs | 2 +- tools/cldr-apps/js/src/esm/cldrText.mjs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/cldr-apps/js/src/esm/cldrTable.mjs b/tools/cldr-apps/js/src/esm/cldrTable.mjs index f0e7dc3ebbf..540da7e43c4 100644 --- a/tools/cldr-apps/js/src/esm/cldrTable.mjs +++ b/tools/cldr-apps/js/src/esm/cldrTable.mjs @@ -684,7 +684,7 @@ function getStatusIcon(statusClass) { case "inherited-unconfirmed": return cldrText.get("inherited"); default: - return "?"; // U+003F + return "\ufffd"; } } diff --git a/tools/cldr-apps/js/src/esm/cldrText.mjs b/tools/cldr-apps/js/src/esm/cldrText.mjs index 2b97e78f374..c1882d63cb9 100644 --- a/tools/cldr-apps/js/src/esm/cldrText.mjs +++ b/tools/cldr-apps/js/src/esm/cldrText.mjs @@ -476,8 +476,8 @@ const strings = { status_contributed: "☑️", status_provisional: "✖️", status_unconfirmed: "❌", - status_missing: "❓️", - status_inherited: "↑", + status_missing: "🕳️", + status_inherited: "⬆️", special_about: "About Survey Tool", special_announcements: "Announcements", From 005be9ab1dee08f5de6e40db281377b7eb3c3050 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 30 May 2024 11:49:13 -0500 Subject: [PATCH 3/7] CLDR-17462 main CSS should be loaded in the bundle, not by Java. - move redesign.css and surveytool.css out of java printfs and into index.js - this gives us the capability for minimization and reduces network loads --- tools/cldr-apps/js/src/index.js | 2 ++ .../src/main/java/org/unicode/cldr/web/SurveyTool.java | 9 --------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tools/cldr-apps/js/src/index.js b/tools/cldr-apps/js/src/index.js index c94442877f2..d3767cad281 100644 --- a/tools/cldr-apps/js/src/index.js +++ b/tools/cldr-apps/js/src/index.js @@ -4,6 +4,8 @@ // global stylesheets import "./css/cldrForum.css"; import "../../../cldr-code/src/main/resources/org/unicode/cldr/tool/reports.css"; +import "../../../cldr-apps/src/main/webapp/surveytool.css"; +import "../../../cldr-apps/src/main/webapp/css/redesign.css"; // module stylesheets need to go here. See cldrVue.mjs // example: import 'someModule/dist/someModule.css' diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyTool.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyTool.java index ffe052fa03d..ddde577fe54 100644 --- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyTool.java +++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyTool.java @@ -209,21 +209,12 @@ private void serveRunnningNormallyPage( private void includeCss(HttpServletRequest request, PrintWriter out) { final String contextPath = request.getContextPath(); - final String cb = getCacheBustingExtension(request); - out.write( - "\n"); /* * Note: cldrForum.css is loaded through webpack */ // bootstrap.min.css -- cf. bootstrap.min.js elsewhere in this file out.write( "\n"); - out.write( - "\n"); } private static final String DD_CLIENT_TOKEN = System.getenv("DD_CLIENT_TOKEN"); From 3a175b183c87a4a26c266ced9346426a1f925aa0 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 30 May 2024 11:57:34 -0500 Subject: [PATCH 4/7] CLDR-17462 updates per review comment --- tools/cldr-apps/js/src/esm/cldrTable.mjs | 5 ++++- tools/cldr-apps/js/src/esm/cldrText.mjs | 4 ++-- tools/cldr-apps/src/main/webapp/surveytool.css | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/cldr-apps/js/src/esm/cldrTable.mjs b/tools/cldr-apps/js/src/esm/cldrTable.mjs index 540da7e43c4..fa64e0b099d 100644 --- a/tools/cldr-apps/js/src/esm/cldrTable.mjs +++ b/tools/cldr-apps/js/src/esm/cldrTable.mjs @@ -682,7 +682,10 @@ function getStatusIcon(statusClass) { return cldrText.get(`status_${statusClass}`); case "inherited-provisional": case "inherited-unconfirmed": - return cldrText.get("inherited"); + return ( + cldrText.get(`status_inherited`) + + getStatusIcon(statusClass.split("-")[1]) + ); default: return "\ufffd"; } diff --git a/tools/cldr-apps/js/src/esm/cldrText.mjs b/tools/cldr-apps/js/src/esm/cldrText.mjs index c1882d63cb9..8ab0b9973c0 100644 --- a/tools/cldr-apps/js/src/esm/cldrText.mjs +++ b/tools/cldr-apps/js/src/esm/cldrText.mjs @@ -472,10 +472,10 @@ const strings = { report_missing: "Missing", // for approval status, see VoteResolver.Status - status_approved: "✅", + status_approved: "✅\uFE0F", status_contributed: "☑️", status_provisional: "✖️", - status_unconfirmed: "❌", + status_unconfirmed: "❌\uFE0F", status_missing: "🕳️", status_inherited: "⬆️", diff --git a/tools/cldr-apps/src/main/webapp/surveytool.css b/tools/cldr-apps/src/main/webapp/surveytool.css index 84c82fa3a96..8e787ea6ec8 100644 --- a/tools/cldr-apps/src/main/webapp/surveytool.css +++ b/tools/cldr-apps/src/main/webapp/surveytool.css @@ -1703,7 +1703,7 @@ The the following can work here: */ -/* Kashmiri and Urdu are typically in Nastaliq. Kashmiri in particular uses a letter that is +/* Kashmiri and Urdu are typically in Nastaliq. Kashmiri in particular uses a letter that is not rendered correctly in Noto Naskh (see CLDR-16595) */ :lang(ks), :lang(ur) { @@ -2378,6 +2378,7 @@ span.pathChunk:after .statuscell { text-align: center; font-weight: bold; + font-variant-emoji: emoji; } .voteDiv .winningStatus { From e39d2b80a8aa128491e26ef6ea340535d6b4951c Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 30 May 2024 12:09:06 -0500 Subject: [PATCH 5/7] CLDR-17462 workaround css emoji issue --- tools/cldr-apps/js/src/index.js | 8 ++++---- tools/cldr-apps/src/main/webapp/surveytool.css | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/cldr-apps/js/src/index.js b/tools/cldr-apps/js/src/index.js index d3767cad281..cbfde3f5e79 100644 --- a/tools/cldr-apps/js/src/index.js +++ b/tools/cldr-apps/js/src/index.js @@ -1,16 +1,16 @@ // This file gets bundled into bundle.js’s cldrBundle global // From there, it is imported by SurveyTool.includeJavaScript() +// module stylesheets need to go here. See cldrVue.mjs +// example: import 'someModule/dist/someModule.css' +import "ant-design-vue/dist/antd.min.css"; + // global stylesheets import "./css/cldrForum.css"; import "../../../cldr-code/src/main/resources/org/unicode/cldr/tool/reports.css"; import "../../../cldr-apps/src/main/webapp/surveytool.css"; import "../../../cldr-apps/src/main/webapp/css/redesign.css"; -// module stylesheets need to go here. See cldrVue.mjs -// example: import 'someModule/dist/someModule.css' -import "ant-design-vue/dist/antd.min.css"; - import * as cldrGui from "./esm/cldrGui.mjs"; import * as cldrVue from "./esm/cldrVue.mjs"; import * as cldrMonitoring from "./esm/cldrMonitoring.mjs"; diff --git a/tools/cldr-apps/src/main/webapp/surveytool.css b/tools/cldr-apps/src/main/webapp/surveytool.css index 8e787ea6ec8..d5419d4a854 100644 --- a/tools/cldr-apps/src/main/webapp/surveytool.css +++ b/tools/cldr-apps/src/main/webapp/surveytool.css @@ -2377,7 +2377,7 @@ span.pathChunk:after .statuscell { text-align: center; - font-weight: bold; + font-family: emoji !important; font-variant-emoji: emoji; } From e0a503e3f67c051579f02a7a53912c483911bc91 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 30 May 2024 12:23:10 -0500 Subject: [PATCH 6/7] CLDR-17462 right align status cell, use nbsp --- tools/cldr-apps/js/src/esm/cldrTable.mjs | 1 + tools/cldr-apps/src/main/webapp/surveytool.css | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/cldr-apps/js/src/esm/cldrTable.mjs b/tools/cldr-apps/js/src/esm/cldrTable.mjs index fa64e0b099d..f319fd309df 100644 --- a/tools/cldr-apps/js/src/esm/cldrTable.mjs +++ b/tools/cldr-apps/js/src/esm/cldrTable.mjs @@ -684,6 +684,7 @@ function getStatusIcon(statusClass) { case "inherited-unconfirmed": return ( cldrText.get(`status_inherited`) + + "\u202F" + getStatusIcon(statusClass.split("-")[1]) ); default: diff --git a/tools/cldr-apps/src/main/webapp/surveytool.css b/tools/cldr-apps/src/main/webapp/surveytool.css index d5419d4a854..b5155254f95 100644 --- a/tools/cldr-apps/src/main/webapp/surveytool.css +++ b/tools/cldr-apps/src/main/webapp/surveytool.css @@ -2376,7 +2376,7 @@ span.pathChunk:after } .statuscell { - text-align: center; + text-align: right; font-family: emoji !important; font-variant-emoji: emoji; } From 12e63dfbe63de09ab1a1f278555b2ad602711859 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 30 May 2024 15:34:53 -0500 Subject: [PATCH 7/7] CLDR-17462 use a zwsp between the inherited mark and the status icon --- tools/cldr-apps/js/src/esm/cldrTable.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cldr-apps/js/src/esm/cldrTable.mjs b/tools/cldr-apps/js/src/esm/cldrTable.mjs index f319fd309df..f9d34a173e9 100644 --- a/tools/cldr-apps/js/src/esm/cldrTable.mjs +++ b/tools/cldr-apps/js/src/esm/cldrTable.mjs @@ -684,7 +684,7 @@ function getStatusIcon(statusClass) { case "inherited-unconfirmed": return ( cldrText.get(`status_inherited`) + - "\u202F" + + "\u200B" + getStatusIcon(statusClass.split("-")[1]) ); default: