diff --git a/tools/cldr-apps/js/src/esm/cldrTable.mjs b/tools/cldr-apps/js/src/esm/cldrTable.mjs index 5683f2621b1..f9d34a173e9 100644 --- a/tools/cldr-apps/js/src/esm/cldrTable.mjs +++ b/tools/cldr-apps/js/src/esm/cldrTable.mjs @@ -676,16 +676,19 @@ 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(`status_inherited`) + + "\u200B" + + getStatusIcon(statusClass.split("-")[1]) + ); 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 9e8faa7f4e3..8ab0b9973c0 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: "✅\uFE0F", + status_contributed: "☑️", + status_provisional: "✖️", + status_unconfirmed: "❌\uFE0F", + status_missing: "🕳️", + status_inherited: "⬆️", + special_about: "About Survey Tool", special_announcements: "Announcements", special_account: "Account Settings", diff --git a/tools/cldr-apps/js/src/index.js b/tools/cldr-apps/js/src/index.js index c94442877f2..cbfde3f5e79 100644 --- a/tools/cldr-apps/js/src/index.js +++ b/tools/cldr-apps/js/src/index.js @@ -1,14 +1,16 @@ // This file gets bundled into bundle.js’s cldrBundle global // From there, it is imported by SurveyTool.includeJavaScript() -// global stylesheets -import "./css/cldrForum.css"; -import "../../../cldr-code/src/main/resources/org/unicode/cldr/tool/reports.css"; - // 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"; + 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/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"); diff --git a/tools/cldr-apps/src/main/webapp/surveytool.css b/tools/cldr-apps/src/main/webapp/surveytool.css index 84c82fa3a96..b5155254f95 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) { @@ -2376,8 +2376,9 @@ span.pathChunk:after } .statuscell { - text-align: center; - font-weight: bold; + text-align: right; + font-family: emoji !important; + font-variant-emoji: emoji; } .voteDiv .winningStatus {