CLDR-7646 static init: remove SurveyTool loading VettingViewer unnnec…

…essarily - move the header CSS into CLDRURLS, it really could go in surveytool.css or something.
unicode-org · Jan 5, 2024 · 567389d · 567389d
1 parent 83003ac
commit 567389d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
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
@@ -11,8 +11,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.json.JSONException;
+import org.unicode.cldr.util.CLDRURLS;
 import org.unicode.cldr.util.CldrUtility;
-import org.unicode.cldr.util.VettingViewer;
 
 public class SurveyTool extends HttpServlet {
     static final Logger logger = SurveyLog.forClass(SurveyTool.class);
@@ -95,7 +95,7 @@ private void serveWaitingPage(HttpServletRequest request, PrintWriter out, Surve
         out.write("<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>\n");
         out.write("<title>CLDR Survey Tool | Starting</title>\n");
         includeCss(request, out);
-        out.write(VettingViewer.getHeaderStyles() + "\n");
+        out.write(CLDRURLS.getVettingViewerHeaderStyles() + "\n");
         try {
             includeJavaScript(request, out);
         } catch (JSONException e) {
@@ -173,7 +173,7 @@ private void serveRunnningNormallyPage(
         out.write("<meta name='gigabot' content='nofollow'>\n");
         out.write(FAVICON_LINK);
         includeCss(request, out);
-        out.write(VettingViewer.getHeaderStyles() + "\n");
+        out.write(CLDRURLS.getVettingViewerHeaderStyles() + "\n");
         try {
             includeJavaScript(request, out);
         } catch (JSONException e) {

diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java
@@ -396,4 +396,24 @@ public static boolean isKnownHash(String hash) {
     public static final String toHTML(String url) {
         return "<a href=\"" + url + "\">" + url + "</a>";
     }
+
+    /**
+     * Provide the styles for inclusion into the ST &lt;head&gt; element.
+     *
+     * @return
+     */
+    public static String getVettingViewerHeaderStyles() {
+        return "<style>\n"
+                + ".hide {display:none}\n"
+                + ".vve {}\n"
+                + ".vvn {}\n"
+                + ".vvp {}\n"
+                + ".vvl {}\n"
+                + ".vvm {}\n"
+                + ".vvu {}\n"
+                + ".vvw {}\n"
+                + ".vvd {}\n"
+                + ".vvo {}\n"
+                + "</style>";
+    }
 }